[Develop and Manual test] /api/v1/tagList

 Changes to be committed:
	modified:   front-end/app/scripts/controllers/Execution.ts
	modified:   front-end/app/scripts/controllers/SelectCommand.ts
	modified:   front-end/app/scripts/services/APIEndPoint.ts
	modified:   front-end/app/scripts/services/MyModal.ts
	modified:   front-end/app/templates/select-command.html
	modified:   front-end/dist/bundle.js
	modified:   front-end/dist/templates/select-command.html
	modified:   server/api/tagList/index.js
	new file:   server/api/v1/tagList/index.js
	modified:   server/routes.js

diff --git a/front-end/app/scripts/controllers/Execution.ts b/front-end/app/scripts/controllers/Execution.ts
index e9d866a..a311de0 100644 (file)
--- a/front-end/app/scripts/controllers/Execution.ts
+++ b/front-end/app/scripts/controllers/Execution.ts
@@ -16,8 +16,8 @@ namespace app.controllers {
             this.$scope.$broadcast('close');
             
             // add <command> directive
-            //this.MyModal.selectCommand();
-            this.commandInfoList.push(new declares.CommandInfo('mrcImageNoiseAdd'));
+            this.MyModal.selectCommand();
+            //this.commandInfoList.push(new declares.CommandInfo('mrcImageNoiseAdd'));
         }
 
         public open() {

diff --git a/front-end/app/scripts/controllers/SelectCommand.ts b/front-end/app/scripts/controllers/SelectCommand.ts
index c9983d5..9f770e8 100644 (file)
--- a/front-end/app/scripts/controllers/SelectCommand.ts
+++ b/front-end/app/scripts/controllers/SelectCommand.ts
@@ -1,11 +1,16 @@
 namespace app.controllers {
     export class SelectCommand{ 
 
-        public page = "History";
-
         public static $inject = ['$scope', 'APIEndPoint'];
+        private tags: string[];
 
-        constructor($scope: ng.IScope, private APIEndPOint: services.APIEndPoint) {
+        constructor($scope: ng.IScope, private APIEndPoint: services.APIEndPoint) {
+            var controller = this;
+            this.APIEndPoint
+                .getTags()
+                .$promise.then((result) => {
+                   controller.tags = result.info; 
+                });
 
         } 
     }

diff --git a/front-end/app/scripts/services/APIEndPoint.ts b/front-end/app/scripts/services/APIEndPoint.ts
index 27b546e..76b1732 100644 (file)
--- a/front-end/app/scripts/services/APIEndPoint.ts
+++ b/front-end/app/scripts/services/APIEndPoint.ts
@@ -47,6 +47,11 @@ namespace app.services {
             return this.resource(endPoint,{}).get();
         }
 
+        public getTags(): ng.resource.IResource<declares.IResponse> {
+            var endPoint = '/api/v1/tagList';
+            return this.resource(endPoint, {}).get();
+        }
+
         public execute(data: any): ng.IHttpPromise<{}> {
             var endPoint = '/api/v1/execution';
             var fd = new FormData()

diff --git a/front-end/app/scripts/services/MyModal.ts b/front-end/app/scripts/services/MyModal.ts
index 447f800..9629bd1 100644 (file)
--- a/front-end/app/scripts/services/MyModal.ts
+++ b/front-end/app/scripts/services/MyModal.ts
@@ -29,6 +29,7 @@ namespace app.services {
         public selectCommand(): ng.ui.bootstrap.IModalServiceInstance {
             this.modalOption.templateUrl = 'templates/select-command.html';
             this.modalOption.controller = 'selectCommandController';
+            this.modalOption.controllerAs = 'c';
             this.modalOption.size = 'lg';
             return this.$uibModal.open(this.modalOption);
         }

diff --git a/front-end/app/templates/select-command.html b/front-end/app/templates/select-command.html
index 5516fba..0278295 100644 (file)
--- a/front-end/app/templates/select-command.html
+++ b/front-end/app/templates/select-command.html
@@ -5,6 +5,8 @@
 <div class="modal-body">
     <div class="row">
         <div class="col-md-8">
+            <p ng-repeat="tag in c.tags">{{tag}}</p>
+            <!--
             <div class="btn-group"ng-repeat="tag in tags">
                 <button type="button" class="btn btn-default btn-xs" ng-click="changeTag(tag)"><span class="glyphicon glyphicon-tag"></span>{{tag}}</button>
             </div>
@@ -18,14 +20,15 @@
                     </button>
                 </span>
             </div>
+            -->
         </div>
     </div>
 </div>
 
 <div class="modal-footer">
     <div class="row">
-        <!--<div ng-repeat="command in commands | filter:searchText |tagFilter:tag">-->
-        <!-- <div ng-repeat="command in commands | filter:searchText | tagFilter:tag"> -->
+        <!--
+        <div ng-repeat="command in commands | filter:searchText | tagFilter:tag">
         <div ng-repeat="command in commands | filter:searchText">
             <div class="col-md-6">
                 <a class="pull-left" ng-click="selectCommand(command.name)" ng-if="$even">{{command.name}}</a>
@@ -34,5 +37,6 @@
                 <a class="pull-left" ng-click="selectCommand(command.name)" ng-if="$odd">{{command.name}}</a>
             </div>
         </div>
+            -->
     </div>
 </div>

diff --git a/front-end/dist/bundle.js b/front-end/dist/bundle.js
index a897fd6..3a80e17 100644 (file)
--- a/front-end/dist/bundle.js
+++ b/front-end/dist/bundle.js
@@ -41047,6 +41047,10 @@
                        var endPoint = '/api/v1/all/workspace/directory';
                        return this.resource(endPoint, {}).get();
                    };
+                   APIEndPoint.prototype.getTags = function () {
+                       var endPoint = '/api/v1/tagList';
+                       return this.resource(endPoint, {}).get();
+                   };
                    APIEndPoint.prototype.execute = function (data) {
                        var endPoint = '/api/v1/execution';
                        var fd = new FormData();
@@ -41085,6 +41089,7 @@
                    MyModal.prototype.selectCommand = function () {
                        this.modalOption.templateUrl = 'templates/select-command.html';
                        this.modalOption.controller = 'selectCommandController';
+                       this.modalOption.controllerAs = 'c';
                        this.modalOption.size = 'lg';
                        return this.$uibModal.open(this.modalOption);
                    };
@@ -41348,7 +41353,7 @@
                    ;
                    Execution.prototype.add = function () {
                        this.$scope.$broadcast('close');
-                       this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
+                       this.MyModal.selectCommand();
                    };
                    Execution.prototype.open = function () {
                        var result = this.MyModal.open('SelectCommand');
@@ -41416,9 +41421,14 @@
            var controllers;
            (function (controllers) {
                var SelectCommand = (function () {
-                   function SelectCommand($scope, APIEndPOint) {
-                       this.APIEndPOint = APIEndPOint;
-                       this.page = "History";
+                   function SelectCommand($scope, APIEndPoint) {
+                       this.APIEndPoint = APIEndPoint;
+                       var controller = this;
+                       this.APIEndPoint
+                           .getTags()
+                           .$promise.then(function (result) {
+                           controller.tags = result.info;
+                       });
                    }
                    SelectCommand.$inject = ['$scope', 'APIEndPoint'];
                    return SelectCommand;
@@ -41525,6 +41535,10 @@
                        var endPoint = '/api/v1/all/workspace/directory';
                        return this.resource(endPoint, {}).get();
                    };
+                   APIEndPoint.prototype.getTags = function () {
+                       var endPoint = '/api/v1/tagList';
+                       return this.resource(endPoint, {}).get();
+                   };
                    APIEndPoint.prototype.execute = function (data) {
                        var endPoint = '/api/v1/execution';
                        var fd = new FormData();
@@ -41563,6 +41577,7 @@
                    MyModal.prototype.selectCommand = function () {
                        this.modalOption.templateUrl = 'templates/select-command.html';
                        this.modalOption.controller = 'selectCommandController';
+                       this.modalOption.controllerAs = 'c';
                        this.modalOption.size = 'lg';
                        return this.$uibModal.open(this.modalOption);
                    };
@@ -41826,7 +41841,7 @@
                    ;
                    Execution.prototype.add = function () {
                        this.$scope.$broadcast('close');
-                       this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
+                       this.MyModal.selectCommand();
                    };
                    Execution.prototype.open = function () {
                        var result = this.MyModal.open('SelectCommand');
@@ -41894,9 +41909,14 @@
            var controllers;
            (function (controllers) {
                var SelectCommand = (function () {
-                   function SelectCommand($scope, APIEndPOint) {
-                       this.APIEndPOint = APIEndPOint;
-                       this.page = "History";
+                   function SelectCommand($scope, APIEndPoint) {
+                       this.APIEndPoint = APIEndPoint;
+                       var controller = this;
+                       this.APIEndPoint
+                           .getTags()
+                           .$promise.then(function (result) {
+                           controller.tags = result.info;
+                       });
                    }
                    SelectCommand.$inject = ['$scope', 'APIEndPoint'];
                    return SelectCommand;
@@ -42003,6 +42023,10 @@
                        var endPoint = '/api/v1/all/workspace/directory';
                        return this.resource(endPoint, {}).get();
                    };
+                   APIEndPoint.prototype.getTags = function () {
+                       var endPoint = '/api/v1/tagList';
+                       return this.resource(endPoint, {}).get();
+                   };
                    APIEndPoint.prototype.execute = function (data) {
                        var endPoint = '/api/v1/execution';
                        var fd = new FormData();
@@ -42041,6 +42065,7 @@
                    MyModal.prototype.selectCommand = function () {
                        this.modalOption.templateUrl = 'templates/select-command.html';
                        this.modalOption.controller = 'selectCommandController';
+                       this.modalOption.controllerAs = 'c';
                        this.modalOption.size = 'lg';
                        return this.$uibModal.open(this.modalOption);
                    };
@@ -42304,7 +42329,7 @@
                    ;
                    Execution.prototype.add = function () {
                        this.$scope.$broadcast('close');
-                       this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
+                       this.MyModal.selectCommand();
                    };
                    Execution.prototype.open = function () {
                        var result = this.MyModal.open('SelectCommand');
@@ -42372,9 +42397,14 @@
            var controllers;
            (function (controllers) {
                var SelectCommand = (function () {
-                   function SelectCommand($scope, APIEndPOint) {
-                       this.APIEndPOint = APIEndPOint;
-                       this.page = "History";
+                   function SelectCommand($scope, APIEndPoint) {
+                       this.APIEndPoint = APIEndPoint;
+                       var controller = this;
+                       this.APIEndPoint
+                           .getTags()
+                           .$promise.then(function (result) {
+                           controller.tags = result.info;
+                       });
                    }
                    SelectCommand.$inject = ['$scope', 'APIEndPoint'];
                    return SelectCommand;
@@ -42481,6 +42511,10 @@
                        var endPoint = '/api/v1/all/workspace/directory';
                        return this.resource(endPoint, {}).get();
                    };
+                   APIEndPoint.prototype.getTags = function () {
+                       var endPoint = '/api/v1/tagList';
+                       return this.resource(endPoint, {}).get();
+                   };
                    APIEndPoint.prototype.execute = function (data) {
                        var endPoint = '/api/v1/execution';
                        var fd = new FormData();
@@ -42519,6 +42553,7 @@
                    MyModal.prototype.selectCommand = function () {
                        this.modalOption.templateUrl = 'templates/select-command.html';
                        this.modalOption.controller = 'selectCommandController';
+                       this.modalOption.controllerAs = 'c';
                        this.modalOption.size = 'lg';
                        return this.$uibModal.open(this.modalOption);
                    };
@@ -42782,7 +42817,7 @@
                    ;
                    Execution.prototype.add = function () {
                        this.$scope.$broadcast('close');
-                       this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
+                       this.MyModal.selectCommand();
                    };
                    Execution.prototype.open = function () {
                        var result = this.MyModal.open('SelectCommand');
@@ -42850,9 +42885,14 @@
            var controllers;
            (function (controllers) {
                var SelectCommand = (function () {
-                   function SelectCommand($scope, APIEndPOint) {
-                       this.APIEndPOint = APIEndPOint;
-                       this.page = "History";
+                   function SelectCommand($scope, APIEndPoint) {
+                       this.APIEndPoint = APIEndPoint;
+                       var controller = this;
+                       this.APIEndPoint
+                           .getTags()
+                           .$promise.then(function (result) {
+                           controller.tags = result.info;
+                       });
                    }
                    SelectCommand.$inject = ['$scope', 'APIEndPoint'];
                    return SelectCommand;
@@ -42959,6 +42999,10 @@
                        var endPoint = '/api/v1/all/workspace/directory';
                        return this.resource(endPoint, {}).get();
                    };
+                   APIEndPoint.prototype.getTags = function () {
+                       var endPoint = '/api/v1/tagList';
+                       return this.resource(endPoint, {}).get();
+                   };
                    APIEndPoint.prototype.execute = function (data) {
                        var endPoint = '/api/v1/execution';
                        var fd = new FormData();
@@ -42997,6 +43041,7 @@
                    MyModal.prototype.selectCommand = function () {
                        this.modalOption.templateUrl = 'templates/select-command.html';
                        this.modalOption.controller = 'selectCommandController';
+                       this.modalOption.controllerAs = 'c';
                        this.modalOption.size = 'lg';
                        return this.$uibModal.open(this.modalOption);
                    };
@@ -43260,7 +43305,7 @@
                    ;
                    Execution.prototype.add = function () {
                        this.$scope.$broadcast('close');
-                       this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
+                       this.MyModal.selectCommand();
                    };
                    Execution.prototype.open = function () {
                        var result = this.MyModal.open('SelectCommand');
@@ -43328,9 +43373,14 @@
            var controllers;
            (function (controllers) {
                var SelectCommand = (function () {
-                   function SelectCommand($scope, APIEndPOint) {
-                       this.APIEndPOint = APIEndPOint;
-                       this.page = "History";
+                   function SelectCommand($scope, APIEndPoint) {
+                       this.APIEndPoint = APIEndPoint;
+                       var controller = this;
+                       this.APIEndPoint
+                           .getTags()
+                           .$promise.then(function (result) {
+                           controller.tags = result.info;
+                       });
                    }
                    SelectCommand.$inject = ['$scope', 'APIEndPoint'];
                    return SelectCommand;
@@ -43437,6 +43487,10 @@
                        var endPoint = '/api/v1/all/workspace/directory';
                        return this.resource(endPoint, {}).get();
                    };
+                   APIEndPoint.prototype.getTags = function () {
+                       var endPoint = '/api/v1/tagList';
+                       return this.resource(endPoint, {}).get();
+                   };
                    APIEndPoint.prototype.execute = function (data) {
                        var endPoint = '/api/v1/execution';
                        var fd = new FormData();
@@ -43475,6 +43529,7 @@
                    MyModal.prototype.selectCommand = function () {
                        this.modalOption.templateUrl = 'templates/select-command.html';
                        this.modalOption.controller = 'selectCommandController';
+                       this.modalOption.controllerAs = 'c';
                        this.modalOption.size = 'lg';
                        return this.$uibModal.open(this.modalOption);
                    };
@@ -43738,7 +43793,7 @@
                    ;
                    Execution.prototype.add = function () {
                        this.$scope.$broadcast('close');
-                       this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
+                       this.MyModal.selectCommand();
                    };
                    Execution.prototype.open = function () {
                        var result = this.MyModal.open('SelectCommand');
@@ -43806,9 +43861,14 @@
            var controllers;
            (function (controllers) {
                var SelectCommand = (function () {
-                   function SelectCommand($scope, APIEndPOint) {
-                       this.APIEndPOint = APIEndPOint;
-                       this.page = "History";
+                   function SelectCommand($scope, APIEndPoint) {
+                       this.APIEndPoint = APIEndPoint;
+                       var controller = this;
+                       this.APIEndPoint
+                           .getTags()
+                           .$promise.then(function (result) {
+                           controller.tags = result.info;
+                       });
                    }
                    SelectCommand.$inject = ['$scope', 'APIEndPoint'];
                    return SelectCommand;
@@ -43915,6 +43975,10 @@
                        var endPoint = '/api/v1/all/workspace/directory';
                        return this.resource(endPoint, {}).get();
                    };
+                   APIEndPoint.prototype.getTags = function () {
+                       var endPoint = '/api/v1/tagList';
+                       return this.resource(endPoint, {}).get();
+                   };
                    APIEndPoint.prototype.execute = function (data) {
                        var endPoint = '/api/v1/execution';
                        var fd = new FormData();
@@ -43953,6 +44017,7 @@
                    MyModal.prototype.selectCommand = function () {
                        this.modalOption.templateUrl = 'templates/select-command.html';
                        this.modalOption.controller = 'selectCommandController';
+                       this.modalOption.controllerAs = 'c';
                        this.modalOption.size = 'lg';
                        return this.$uibModal.open(this.modalOption);
                    };
@@ -44216,7 +44281,7 @@
                    ;
                    Execution.prototype.add = function () {
                        this.$scope.$broadcast('close');
-                       this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
+                       this.MyModal.selectCommand();
                    };
                    Execution.prototype.open = function () {
                        var result = this.MyModal.open('SelectCommand');
@@ -44284,9 +44349,14 @@
            var controllers;
            (function (controllers) {
                var SelectCommand = (function () {
-                   function SelectCommand($scope, APIEndPOint) {
-                       this.APIEndPOint = APIEndPOint;
-                       this.page = "History";
+                   function SelectCommand($scope, APIEndPoint) {
+                       this.APIEndPoint = APIEndPoint;
+                       var controller = this;
+                       this.APIEndPoint
+                           .getTags()
+                           .$promise.then(function (result) {
+                           controller.tags = result.info;
+                       });
                    }
                    SelectCommand.$inject = ['$scope', 'APIEndPoint'];
                    return SelectCommand;
@@ -44393,6 +44463,10 @@
                        var endPoint = '/api/v1/all/workspace/directory';
                        return this.resource(endPoint, {}).get();
                    };
+                   APIEndPoint.prototype.getTags = function () {
+                       var endPoint = '/api/v1/tagList';
+                       return this.resource(endPoint, {}).get();
+                   };
                    APIEndPoint.prototype.execute = function (data) {
                        var endPoint = '/api/v1/execution';
                        var fd = new FormData();
@@ -44431,6 +44505,7 @@
                    MyModal.prototype.selectCommand = function () {
                        this.modalOption.templateUrl = 'templates/select-command.html';
                        this.modalOption.controller = 'selectCommandController';
+                       this.modalOption.controllerAs = 'c';
                        this.modalOption.size = 'lg';
                        return this.$uibModal.open(this.modalOption);
                    };
@@ -44694,7 +44769,7 @@
                    ;
                    Execution.prototype.add = function () {
                        this.$scope.$broadcast('close');
-                       this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
+                       this.MyModal.selectCommand();
                    };
                    Execution.prototype.open = function () {
                        var result = this.MyModal.open('SelectCommand');
@@ -44762,9 +44837,14 @@
            var controllers;
            (function (controllers) {
                var SelectCommand = (function () {
-                   function SelectCommand($scope, APIEndPOint) {
-                       this.APIEndPOint = APIEndPOint;
-                       this.page = "History";
+                   function SelectCommand($scope, APIEndPoint) {
+                       this.APIEndPoint = APIEndPoint;
+                       var controller = this;
+                       this.APIEndPoint
+                           .getTags()
+                           .$promise.then(function (result) {
+                           controller.tags = result.info;
+                       });
                    }
                    SelectCommand.$inject = ['$scope', 'APIEndPoint'];
                    return SelectCommand;
@@ -44871,6 +44951,10 @@
                        var endPoint = '/api/v1/all/workspace/directory';
                        return this.resource(endPoint, {}).get();
                    };
+                   APIEndPoint.prototype.getTags = function () {
+                       var endPoint = '/api/v1/tagList';
+                       return this.resource(endPoint, {}).get();
+                   };
                    APIEndPoint.prototype.execute = function (data) {
                        var endPoint = '/api/v1/execution';
                        var fd = new FormData();
@@ -44909,6 +44993,7 @@
                    MyModal.prototype.selectCommand = function () {
                        this.modalOption.templateUrl = 'templates/select-command.html';
                        this.modalOption.controller = 'selectCommandController';
+                       this.modalOption.controllerAs = 'c';
                        this.modalOption.size = 'lg';
                        return this.$uibModal.open(this.modalOption);
                    };
@@ -45172,7 +45257,7 @@
                    ;
                    Execution.prototype.add = function () {
                        this.$scope.$broadcast('close');
-                       this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
+                       this.MyModal.selectCommand();
                    };
                    Execution.prototype.open = function () {
                        var result = this.MyModal.open('SelectCommand');
@@ -45240,9 +45325,14 @@
            var controllers;
            (function (controllers) {
                var SelectCommand = (function () {
-                   function SelectCommand($scope, APIEndPOint) {
-                       this.APIEndPOint = APIEndPOint;
-                       this.page = "History";
+                   function SelectCommand($scope, APIEndPoint) {
+                       this.APIEndPoint = APIEndPoint;
+                       var controller = this;
+                       this.APIEndPoint
+                           .getTags()
+                           .$promise.then(function (result) {
+                           controller.tags = result.info;
+                       });
                    }
                    SelectCommand.$inject = ['$scope', 'APIEndPoint'];
                    return SelectCommand;
@@ -45349,6 +45439,10 @@
                        var endPoint = '/api/v1/all/workspace/directory';
                        return this.resource(endPoint, {}).get();
                    };
+                   APIEndPoint.prototype.getTags = function () {
+                       var endPoint = '/api/v1/tagList';
+                       return this.resource(endPoint, {}).get();
+                   };
                    APIEndPoint.prototype.execute = function (data) {
                        var endPoint = '/api/v1/execution';
                        var fd = new FormData();
@@ -45387,6 +45481,7 @@
                    MyModal.prototype.selectCommand = function () {
                        this.modalOption.templateUrl = 'templates/select-command.html';
                        this.modalOption.controller = 'selectCommandController';
+                       this.modalOption.controllerAs = 'c';
                        this.modalOption.size = 'lg';
                        return this.$uibModal.open(this.modalOption);
                    };
@@ -45650,7 +45745,7 @@
                    ;
                    Execution.prototype.add = function () {
                        this.$scope.$broadcast('close');
-                       this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
+                       this.MyModal.selectCommand();
                    };
                    Execution.prototype.open = function () {
                        var result = this.MyModal.open('SelectCommand');
@@ -45718,9 +45813,14 @@
            var controllers;
            (function (controllers) {
                var SelectCommand = (function () {
-                   function SelectCommand($scope, APIEndPOint) {
-                       this.APIEndPOint = APIEndPOint;
-                       this.page = "History";
+                   function SelectCommand($scope, APIEndPoint) {
+                       this.APIEndPoint = APIEndPoint;
+                       var controller = this;
+                       this.APIEndPoint
+                           .getTags()
+                           .$promise.then(function (result) {
+                           controller.tags = result.info;
+                       });
                    }
                    SelectCommand.$inject = ['$scope', 'APIEndPoint'];
                    return SelectCommand;
@@ -45827,6 +45927,10 @@
                        var endPoint = '/api/v1/all/workspace/directory';
                        return this.resource(endPoint, {}).get();
                    };
+                   APIEndPoint.prototype.getTags = function () {
+                       var endPoint = '/api/v1/tagList';
+                       return this.resource(endPoint, {}).get();
+                   };
                    APIEndPoint.prototype.execute = function (data) {
                        var endPoint = '/api/v1/execution';
                        var fd = new FormData();
@@ -45865,6 +45969,7 @@
                    MyModal.prototype.selectCommand = function () {
                        this.modalOption.templateUrl = 'templates/select-command.html';
                        this.modalOption.controller = 'selectCommandController';
+                       this.modalOption.controllerAs = 'c';
                        this.modalOption.size = 'lg';
                        return this.$uibModal.open(this.modalOption);
                    };
@@ -46128,7 +46233,7 @@
                    ;
                    Execution.prototype.add = function () {
                        this.$scope.$broadcast('close');
-                       this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
+                       this.MyModal.selectCommand();
                    };
                    Execution.prototype.open = function () {
                        var result = this.MyModal.open('SelectCommand');
@@ -46196,9 +46301,14 @@
            var controllers;
            (function (controllers) {
                var SelectCommand = (function () {
-                   function SelectCommand($scope, APIEndPOint) {
-                       this.APIEndPOint = APIEndPOint;
-                       this.page = "History";
+                   function SelectCommand($scope, APIEndPoint) {
+                       this.APIEndPoint = APIEndPoint;
+                       var controller = this;
+                       this.APIEndPoint
+                           .getTags()
+                           .$promise.then(function (result) {
+                           controller.tags = result.info;
+                       });
                    }
                    SelectCommand.$inject = ['$scope', 'APIEndPoint'];
                    return SelectCommand;
@@ -46305,6 +46415,10 @@
                        var endPoint = '/api/v1/all/workspace/directory';
                        return this.resource(endPoint, {}).get();
                    };
+                   APIEndPoint.prototype.getTags = function () {
+                       var endPoint = '/api/v1/tagList';
+                       return this.resource(endPoint, {}).get();
+                   };
                    APIEndPoint.prototype.execute = function (data) {
                        var endPoint = '/api/v1/execution';
                        var fd = new FormData();
@@ -46343,6 +46457,7 @@
                    MyModal.prototype.selectCommand = function () {
                        this.modalOption.templateUrl = 'templates/select-command.html';
                        this.modalOption.controller = 'selectCommandController';
+                       this.modalOption.controllerAs = 'c';
                        this.modalOption.size = 'lg';
                        return this.$uibModal.open(this.modalOption);
                    };
@@ -46606,7 +46721,7 @@
                    ;
                    Execution.prototype.add = function () {
                        this.$scope.$broadcast('close');
-                       this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
+                       this.MyModal.selectCommand();
                    };
                    Execution.prototype.open = function () {
                        var result = this.MyModal.open('SelectCommand');
@@ -46674,9 +46789,14 @@
            var controllers;
            (function (controllers) {
                var SelectCommand = (function () {
-                   function SelectCommand($scope, APIEndPOint) {
-                       this.APIEndPOint = APIEndPOint;
-                       this.page = "History";
+                   function SelectCommand($scope, APIEndPoint) {
+                       this.APIEndPoint = APIEndPoint;
+                       var controller = this;
+                       this.APIEndPoint
+                           .getTags()
+                           .$promise.then(function (result) {
+                           controller.tags = result.info;
+                       });
                    }
                    SelectCommand.$inject = ['$scope', 'APIEndPoint'];
                    return SelectCommand;

diff --git a/front-end/dist/templates/select-command.html b/front-end/dist/templates/select-command.html
index 5516fba..0278295 100644 (file)
--- a/front-end/dist/templates/select-command.html
+++ b/front-end/dist/templates/select-command.html
@@ -5,6 +5,8 @@
 <div class="modal-body">
     <div class="row">
         <div class="col-md-8">
+            <p ng-repeat="tag in c.tags">{{tag}}</p>
+            <!--
             <div class="btn-group"ng-repeat="tag in tags">
                 <button type="button" class="btn btn-default btn-xs" ng-click="changeTag(tag)"><span class="glyphicon glyphicon-tag"></span>{{tag}}</button>
             </div>
@@ -18,14 +20,15 @@
                     </button>
                 </span>
             </div>
+            -->
         </div>
     </div>
 </div>
 
 <div class="modal-footer">
     <div class="row">
-        <!--<div ng-repeat="command in commands | filter:searchText |tagFilter:tag">-->
-        <!-- <div ng-repeat="command in commands | filter:searchText | tagFilter:tag"> -->
+        <!--
+        <div ng-repeat="command in commands | filter:searchText | tagFilter:tag">
         <div ng-repeat="command in commands | filter:searchText">
             <div class="col-md-6">
                 <a class="pull-left" ng-click="selectCommand(command.name)" ng-if="$even">{{command.name}}</a>
@@ -34,5 +37,6 @@
                 <a class="pull-left" ng-click="selectCommand(command.name)" ng-if="$odd">{{command.name}}</a>
             </div>
         </div>
+            -->
     </div>
 </div>

diff --git a/server/api/tagList/index.js b/server/api/tagList/index.js
index 9c047ac..e046e7e 100644 (file)
--- a/server/api/tagList/index.js
+++ b/server/api/tagList/index.js
@@ -5,7 +5,11 @@ var router  = express.Router();
 
 router.get('/', function(req, res) {
     var tagList = require('../../../util/json/tag_list');
-    res.json(tagList);
+    var info = {
+       status: 'success',
+       info: tagList 
+   };
+   res.send(info);
 });
 
 module.exports = router;

diff --git a/server/api/v1/tagList/index.js b/server/api/v1/tagList/index.js
new file mode 100644 (file)
index 0000000..b647605
--- /dev/null
+++ b/server/api/v1/tagList/index.js
@@ -0,0 +1,15 @@
+'use strict';
+
+var express = require('express');
+var router  = express.Router();
+
+router.get('/', function(req, res) {
+   var tagList = require(__dirname + '/../../../../user-specific-files/OptionControlFile/tag_list');
+    var info = {
+       status: 'success',
+       info: tagList 
+   };
+   res.send(info);
+});
+
+module.exports = router;

diff --git a/server/routes.js b/server/routes.js
index a8d8917..f71234b 100644 (file)
--- a/server/routes.js
+++ b/server/routes.js
@@ -22,6 +22,7 @@ module.exports = function(app) {
     app.use('/api/v1/workspace/', require(__dirname + '/api/v1/workspace'));
     app.use('/api/v1/all/workspace/directory', require(__dirname + '/api/v1/all/workspace/directory'));
     app.use('/api/v1/optionControlFile', require(__dirname + '/api/v1/optionControlFile'));
+    app.use('/api/v1/tagList', require(__dirname + '/api/v1/tagList'));
 
     app.route('/*')
     .get(function(req, res) {