[Develop and Manual Testing] Front-end select workspace and get file

list

diff --git a/front-end/app/scripts/declares.ts b/front-end/app/scripts/declares.ts
index cd764b8..53bc04d 100644 (file)
--- a/front-end/app/scripts/declares.ts
+++ b/front-end/app/scripts/declares.ts
@@ -48,16 +48,19 @@ namespace app.declares {
 
     export interface IResponse extends ng.resource.IResource<IResponse> {
         status: string,
+        message: string,
         info: any
     }
 
     export interface IResponseOption extends IResponse {
         status: string,
+        message: string,
         info: IOption[]
     }
 
     export interface IResponseFileInfo extends IResponse {
         status: string,
+        message: string,
         info: IFileInfo[]
     }
 

diff --git a/front-end/app/scripts/directives/Command.ts b/front-end/app/scripts/directives/Command.ts
index ec6bec9..5f7daee 100644 (file)
--- a/front-end/app/scripts/directives/Command.ts
+++ b/front-end/app/scripts/directives/Command.ts
@@ -52,30 +52,34 @@ namespace app.directives {
         private name: string;
         private remove: Function;
         private list: declares.CommandInfo[];
+        private workspace: declares.IFileInfo;
 
         // property of ui.bootstrap uib-accordion directive
         private isOpen: boolean;
         private heading: string;
 
         // property about Option directive
-        private files: string[];
+        private files: any;
         private options: declares.IOption[];
+        private dirs: any;
 
         constructor(private APIEndPoint: services.APIEndPoint, private $scope: ng.IScope) {
             var controller = this;
 
-            console.log(this.list);
-
             // Get OptionControlFile and bind it to $scope.options
             this.APIEndPoint
                 .getOptionControlFile('dcdFilePrint')
                 .$promise
                 .then(function(result) {
-                    console.log(result);
                     controller.options = result.info;
                 });
 
-            this.files = ['a.file', 'b.file', 'c.file'];
+            this.APIEndPoint
+                .getDirectories()
+                .$promise
+                .then(function(result) {
+                    controller.dirs = result.info;
+                });
 
             this.heading = "[" + this.index + "]: dcdFilePring";
             this.isOpen = true;
@@ -108,5 +112,26 @@ namespace app.directives {
         public removeMySelf(index:number) {
             this.remove()(index,this.list);
         }
+
+        private reloadFiles() {
+            var fileId = this.workspace.fileId;
+            this.APIEndPoint
+                .getFiles(fileId)
+                .$promise
+                .then((result) => { 
+                    var status = result.status;
+                    if(status === 'success') {
+                        this.files = result.info;
+                    } else {
+                        console.log(result.message);
+                    }
+                });
+        }
+
+        public debug() {
+                    console.log(this.files);
+                    console.log(this.files);
+            console.log(this.workspace);
+        }
     } 
 }

diff --git a/front-end/app/scripts/services/APIEndPoint.ts b/front-end/app/scripts/services/APIEndPoint.ts
index 60adc23..c7fdf4d 100644 (file)
--- a/front-end/app/scripts/services/APIEndPoint.ts
+++ b/front-end/app/scripts/services/APIEndPoint.ts
@@ -34,7 +34,7 @@ namespace app.services {
         }
 
         public getDirectories(): ng.resource.IResource<declares.IResponse> {
-            var endPoint = '/spi/v1/workspace/';
+            var endPoint = '/api/v1/all/workspace/directory';
 
             return this.resource(endPoint).get();
         }

diff --git a/front-end/app/templates/command.html b/front-end/app/templates/command.html
index f9beaed..8b29d4f 100644 (file)
--- a/front-end/app/templates/command.html
+++ b/front-end/app/templates/command.html
@@ -1,21 +1,40 @@
 <div>
-    <uib-accordion-group heading="{{ctrl.heading}}" is-open="ctrl.isOpen" panel-class="panel-danger">
-        <uib-accordion-heading>
-            <h4 class="panel-title">
-                [{{ctrl.index}}: {{ctrl.name}}]
-                <button class="pull-right"
-                        ng-click="ctrl.removeMySelf(ctrl.index)">
-                    <span class="glyphicon glyphicon-remove"></span>
-                </button>
-            </h4>
-        </uib-accordion-heading>
-        <code>
-            <form ng-submit="ctrl.submit()">
-                <option info="o" files="ctrl.files"  ng-repeat="o in ctrl.options"></option>
-                <button type="submit" class="btn btn-default">
-                    Execute
-                </button>
-            </form>
-        </code>
+<uib-accordion-group heading="{{ctrl.heading}}" is-open="ctrl.isOpen" panel-class="panel-danger">
+    <uib-accordion-heading>
+    <h4 class="panel-title">
+        [{{ctrl.index}}: {{ctrl.name}}]
+        <button class="pull-right"
+                ng-click="ctrl.removeMySelf(ctrl.index)">
+            <span class="glyphicon glyphicon-remove"></span>
+        </button>
+    </h4>
+    </uib-accordion-heading>
+    <code>
+        <form class="form-horizontal" ng-submit="ctrl.submit()">
+            <ul class="list-inline">
+                <li>
+                    <label class="control-label">
+                        workspace
+                    </label>
+                    <select class="form-control"
+                            ng-options="dir.name for dir in ctrl.dirs"
+                            ng-model="ctrl.workspace"
+                            ng-change="ctrl.reloadFiles()"
+                            required>
+                    </select>
+                </li>
+            </ul>
+
+            <option info="o" files="ctrl.files"  ng-repeat="o in ctrl.options"></option>
+            <button type="submit" class="btn btn-default">
+                Execute
+            </button>
+
+            <button type="button" ng-click="ctrl.debug()" class="btn btn-default">
+                Debug
+            </button>
+
+        </form>
+    </code>
     </uib-accordion-group>
 </div>

diff --git a/front-end/app/templates/option.html b/front-end/app/templates/option.html
index 14096dd..082b66c 100644 (file)
--- a/front-end/app/templates/option.html
+++ b/front-end/app/templates/option.html
@@ -1,6 +1,6 @@
 <ul class="list-inline">
-    <li ng-repeat="arg in ctrl.info.arg">
-        <span ng-switch="arg.formType">
+<li ng-repeat="arg in ctrl.info.arg">
+    <span ng-switch="arg.formType">
         <span ng-switch-when="number">
             <label class="control-label">
                 {{arg.argName}}
@@ -11,17 +11,18 @@
                    ng-required="ctrl.info.optionProperties">
 
         </span>
-        <span ng-switch-when="text">
+        <span ng-switch-when="select">
             <label class="control-label">
                 {{arg.argName}}
             </label>
             <select class="form-control"
-                    ng-options="file for file in ctrl.files"
+                    ng-options="file.name for file in ctrl.files"
                     ng-model="arg.input"
                     ng-required="ctrl.info.optionProperties">
             </select>
         </span>
-        <span ng-switch-when="select">
+
+        <span ng-switch-when="text">
             <label class="control-label">
                 {{arg.argName}}
             </label>
@@ -30,6 +31,6 @@
                    ng-model="arg.input"
                    ng-required="ctrl.info.optionProperties">
         </span>
-        </p>
-    </li>
+    </span>
+</li>
 </ul>

diff --git a/front-end/dist/bundle.js b/front-end/dist/bundle.js
index aabada4..efb7398 100644 (file)
--- a/front-end/dist/bundle.js
+++ b/front-end/dist/bundle.js
@@ -41038,7 +41038,7 @@
                        return this.resource(endPoint).get();
                    };
                    APIEndPoint.prototype.getDirectories = function () {
-                       var endPoint = '/spi/v1/workspace/';
+                       var endPoint = '/api/v1/all/workspace/directory';
                        return this.resource(endPoint).get();
                    };
                    return APIEndPoint;
@@ -41106,15 +41106,18 @@
                        this.APIEndPoint = APIEndPoint;
                        this.$scope = $scope;
                        var controller = this;
-                       console.log(this.list);
                        this.APIEndPoint
                            .getOptionControlFile('dcdFilePrint')
                            .$promise
                            .then(function (result) {
-                           console.log(result);
                            controller.options = result.info;
                        });
-                       this.files = ['a.file', 'b.file', 'c.file'];
+                       this.APIEndPoint
+                           .getDirectories()
+                           .$promise
+                           .then(function (result) {
+                           controller.dirs = result.info;
+                       });
                        this.heading = "[" + this.index + "]: dcdFilePring";
                        this.isOpen = true;
                        this.$scope.$on('close', function () {
@@ -41139,6 +41142,27 @@
                    CommandController.prototype.removeMySelf = function (index) {
                        this.remove()(index, this.list);
                    };
+                   CommandController.prototype.reloadFiles = function () {
+                       var _this = this;
+                       var fileId = this.workspace.fileId;
+                       this.APIEndPoint
+                           .getFiles(fileId)
+                           .$promise
+                           .then(function (result) {
+                           var status = result.status;
+                           if (status === 'success') {
+                               _this.files = result.info;
+                           }
+                           else {
+                               console.log(result.message);
+                           }
+                       });
+                   };
+                   CommandController.prototype.debug = function () {
+                       console.log(this.files);
+                       console.log(this.files);
+                       console.log(this.workspace);
+                   };
                    CommandController.$inject = ['APIEndPoint', '$scope'];
                    return CommandController;
                })();
@@ -41439,7 +41463,7 @@
                        return this.resource(endPoint).get();
                    };
                    APIEndPoint.prototype.getDirectories = function () {
-                       var endPoint = '/spi/v1/workspace/';
+                       var endPoint = '/api/v1/all/workspace/directory';
                        return this.resource(endPoint).get();
                    };
                    return APIEndPoint;
@@ -41507,15 +41531,18 @@
                        this.APIEndPoint = APIEndPoint;
                        this.$scope = $scope;
                        var controller = this;
-                       console.log(this.list);
                        this.APIEndPoint
                            .getOptionControlFile('dcdFilePrint')
                            .$promise
                            .then(function (result) {
-                           console.log(result);
                            controller.options = result.info;
                        });
-                       this.files = ['a.file', 'b.file', 'c.file'];
+                       this.APIEndPoint
+                           .getDirectories()
+                           .$promise
+                           .then(function (result) {
+                           controller.dirs = result.info;
+                       });
                        this.heading = "[" + this.index + "]: dcdFilePring";
                        this.isOpen = true;
                        this.$scope.$on('close', function () {
@@ -41540,6 +41567,27 @@
                    CommandController.prototype.removeMySelf = function (index) {
                        this.remove()(index, this.list);
                    };
+                   CommandController.prototype.reloadFiles = function () {
+                       var _this = this;
+                       var fileId = this.workspace.fileId;
+                       this.APIEndPoint
+                           .getFiles(fileId)
+                           .$promise
+                           .then(function (result) {
+                           var status = result.status;
+                           if (status === 'success') {
+                               _this.files = result.info;
+                           }
+                           else {
+                               console.log(result.message);
+                           }
+                       });
+                   };
+                   CommandController.prototype.debug = function () {
+                       console.log(this.files);
+                       console.log(this.files);
+                       console.log(this.workspace);
+                   };
                    CommandController.$inject = ['APIEndPoint', '$scope'];
                    return CommandController;
                })();
@@ -41840,7 +41888,7 @@
                        return this.resource(endPoint).get();
                    };
                    APIEndPoint.prototype.getDirectories = function () {
-                       var endPoint = '/spi/v1/workspace/';
+                       var endPoint = '/api/v1/all/workspace/directory';
                        return this.resource(endPoint).get();
                    };
                    return APIEndPoint;
@@ -41908,15 +41956,18 @@
                        this.APIEndPoint = APIEndPoint;
                        this.$scope = $scope;
                        var controller = this;
-                       console.log(this.list);
                        this.APIEndPoint
                            .getOptionControlFile('dcdFilePrint')
                            .$promise
                            .then(function (result) {
-                           console.log(result);
                            controller.options = result.info;
                        });
-                       this.files = ['a.file', 'b.file', 'c.file'];
+                       this.APIEndPoint
+                           .getDirectories()
+                           .$promise
+                           .then(function (result) {
+                           controller.dirs = result.info;
+                       });
                        this.heading = "[" + this.index + "]: dcdFilePring";
                        this.isOpen = true;
                        this.$scope.$on('close', function () {
@@ -41941,6 +41992,27 @@
                    CommandController.prototype.removeMySelf = function (index) {
                        this.remove()(index, this.list);
                    };
+                   CommandController.prototype.reloadFiles = function () {
+                       var _this = this;
+                       var fileId = this.workspace.fileId;
+                       this.APIEndPoint
+                           .getFiles(fileId)
+                           .$promise
+                           .then(function (result) {
+                           var status = result.status;
+                           if (status === 'success') {
+                               _this.files = result.info;
+                           }
+                           else {
+                               console.log(result.message);
+                           }
+                       });
+                   };
+                   CommandController.prototype.debug = function () {
+                       console.log(this.files);
+                       console.log(this.files);
+                       console.log(this.workspace);
+                   };
                    CommandController.$inject = ['APIEndPoint', '$scope'];
                    return CommandController;
                })();
@@ -42241,7 +42313,7 @@
                        return this.resource(endPoint).get();
                    };
                    APIEndPoint.prototype.getDirectories = function () {
-                       var endPoint = '/spi/v1/workspace/';
+                       var endPoint = '/api/v1/all/workspace/directory';
                        return this.resource(endPoint).get();
                    };
                    return APIEndPoint;
@@ -42309,15 +42381,18 @@
                        this.APIEndPoint = APIEndPoint;
                        this.$scope = $scope;
                        var controller = this;
-                       console.log(this.list);
                        this.APIEndPoint
                            .getOptionControlFile('dcdFilePrint')
                            .$promise
                            .then(function (result) {
-                           console.log(result);
                            controller.options = result.info;
                        });
-                       this.files = ['a.file', 'b.file', 'c.file'];
+                       this.APIEndPoint
+                           .getDirectories()
+                           .$promise
+                           .then(function (result) {
+                           controller.dirs = result.info;
+                       });
                        this.heading = "[" + this.index + "]: dcdFilePring";
                        this.isOpen = true;
                        this.$scope.$on('close', function () {
@@ -42342,6 +42417,27 @@
                    CommandController.prototype.removeMySelf = function (index) {
                        this.remove()(index, this.list);
                    };
+                   CommandController.prototype.reloadFiles = function () {
+                       var _this = this;
+                       var fileId = this.workspace.fileId;
+                       this.APIEndPoint
+                           .getFiles(fileId)
+                           .$promise
+                           .then(function (result) {
+                           var status = result.status;
+                           if (status === 'success') {
+                               _this.files = result.info;
+                           }
+                           else {
+                               console.log(result.message);
+                           }
+                       });
+                   };
+                   CommandController.prototype.debug = function () {
+                       console.log(this.files);
+                       console.log(this.files);
+                       console.log(this.workspace);
+                   };
                    CommandController.$inject = ['APIEndPoint', '$scope'];
                    return CommandController;
                })();
@@ -42642,7 +42738,7 @@
                        return this.resource(endPoint).get();
                    };
                    APIEndPoint.prototype.getDirectories = function () {
-                       var endPoint = '/spi/v1/workspace/';
+                       var endPoint = '/api/v1/all/workspace/directory';
                        return this.resource(endPoint).get();
                    };
                    return APIEndPoint;
@@ -42710,15 +42806,18 @@
                        this.APIEndPoint = APIEndPoint;
                        this.$scope = $scope;
                        var controller = this;
-                       console.log(this.list);
                        this.APIEndPoint
                            .getOptionControlFile('dcdFilePrint')
                            .$promise
                            .then(function (result) {
-                           console.log(result);
                            controller.options = result.info;
                        });
-                       this.files = ['a.file', 'b.file', 'c.file'];
+                       this.APIEndPoint
+                           .getDirectories()
+                           .$promise
+                           .then(function (result) {
+                           controller.dirs = result.info;
+                       });
                        this.heading = "[" + this.index + "]: dcdFilePring";
                        this.isOpen = true;
                        this.$scope.$on('close', function () {
@@ -42743,6 +42842,27 @@
                    CommandController.prototype.removeMySelf = function (index) {
                        this.remove()(index, this.list);
                    };
+                   CommandController.prototype.reloadFiles = function () {
+                       var _this = this;
+                       var fileId = this.workspace.fileId;
+                       this.APIEndPoint
+                           .getFiles(fileId)
+                           .$promise
+                           .then(function (result) {
+                           var status = result.status;
+                           if (status === 'success') {
+                               _this.files = result.info;
+                           }
+                           else {
+                               console.log(result.message);
+                           }
+                       });
+                   };
+                   CommandController.prototype.debug = function () {
+                       console.log(this.files);
+                       console.log(this.files);
+                       console.log(this.workspace);
+                   };
                    CommandController.$inject = ['APIEndPoint', '$scope'];
                    return CommandController;
                })();
@@ -43043,7 +43163,7 @@
                        return this.resource(endPoint).get();
                    };
                    APIEndPoint.prototype.getDirectories = function () {
-                       var endPoint = '/spi/v1/workspace/';
+                       var endPoint = '/api/v1/all/workspace/directory';
                        return this.resource(endPoint).get();
                    };
                    return APIEndPoint;
@@ -43111,15 +43231,18 @@
                        this.APIEndPoint = APIEndPoint;
                        this.$scope = $scope;
                        var controller = this;
-                       console.log(this.list);
                        this.APIEndPoint
                            .getOptionControlFile('dcdFilePrint')
                            .$promise
                            .then(function (result) {
-                           console.log(result);
                            controller.options = result.info;
                        });
-                       this.files = ['a.file', 'b.file', 'c.file'];
+                       this.APIEndPoint
+                           .getDirectories()
+                           .$promise
+                           .then(function (result) {
+                           controller.dirs = result.info;
+                       });
                        this.heading = "[" + this.index + "]: dcdFilePring";
                        this.isOpen = true;
                        this.$scope.$on('close', function () {
@@ -43144,6 +43267,27 @@
                    CommandController.prototype.removeMySelf = function (index) {
                        this.remove()(index, this.list);
                    };
+                   CommandController.prototype.reloadFiles = function () {
+                       var _this = this;
+                       var fileId = this.workspace.fileId;
+                       this.APIEndPoint
+                           .getFiles(fileId)
+                           .$promise
+                           .then(function (result) {
+                           var status = result.status;
+                           if (status === 'success') {
+                               _this.files = result.info;
+                           }
+                           else {
+                               console.log(result.message);
+                           }
+                       });
+                   };
+                   CommandController.prototype.debug = function () {
+                       console.log(this.files);
+                       console.log(this.files);
+                       console.log(this.workspace);
+                   };
                    CommandController.$inject = ['APIEndPoint', '$scope'];
                    return CommandController;
                })();
@@ -43444,7 +43588,7 @@
                        return this.resource(endPoint).get();
                    };
                    APIEndPoint.prototype.getDirectories = function () {
-                       var endPoint = '/spi/v1/workspace/';
+                       var endPoint = '/api/v1/all/workspace/directory';
                        return this.resource(endPoint).get();
                    };
                    return APIEndPoint;
@@ -43512,15 +43656,18 @@
                        this.APIEndPoint = APIEndPoint;
                        this.$scope = $scope;
                        var controller = this;
-                       console.log(this.list);
                        this.APIEndPoint
                            .getOptionControlFile('dcdFilePrint')
                            .$promise
                            .then(function (result) {
-                           console.log(result);
                            controller.options = result.info;
                        });
-                       this.files = ['a.file', 'b.file', 'c.file'];
+                       this.APIEndPoint
+                           .getDirectories()
+                           .$promise
+                           .then(function (result) {
+                           controller.dirs = result.info;
+                       });
                        this.heading = "[" + this.index + "]: dcdFilePring";
                        this.isOpen = true;
                        this.$scope.$on('close', function () {
@@ -43545,6 +43692,27 @@
                    CommandController.prototype.removeMySelf = function (index) {
                        this.remove()(index, this.list);
                    };
+                   CommandController.prototype.reloadFiles = function () {
+                       var _this = this;
+                       var fileId = this.workspace.fileId;
+                       this.APIEndPoint
+                           .getFiles(fileId)
+                           .$promise
+                           .then(function (result) {
+                           var status = result.status;
+                           if (status === 'success') {
+                               _this.files = result.info;
+                           }
+                           else {
+                               console.log(result.message);
+                           }
+                       });
+                   };
+                   CommandController.prototype.debug = function () {
+                       console.log(this.files);
+                       console.log(this.files);
+                       console.log(this.workspace);
+                   };
                    CommandController.$inject = ['APIEndPoint', '$scope'];
                    return CommandController;
                })();
@@ -43845,7 +44013,7 @@
                        return this.resource(endPoint).get();
                    };
                    APIEndPoint.prototype.getDirectories = function () {
-                       var endPoint = '/spi/v1/workspace/';
+                       var endPoint = '/api/v1/all/workspace/directory';
                        return this.resource(endPoint).get();
                    };
                    return APIEndPoint;
@@ -43913,15 +44081,18 @@
                        this.APIEndPoint = APIEndPoint;
                        this.$scope = $scope;
                        var controller = this;
-                       console.log(this.list);
                        this.APIEndPoint
                            .getOptionControlFile('dcdFilePrint')
                            .$promise
                            .then(function (result) {
-                           console.log(result);
                            controller.options = result.info;
                        });
-                       this.files = ['a.file', 'b.file', 'c.file'];
+                       this.APIEndPoint
+                           .getDirectories()
+                           .$promise
+                           .then(function (result) {
+                           controller.dirs = result.info;
+                       });
                        this.heading = "[" + this.index + "]: dcdFilePring";
                        this.isOpen = true;
                        this.$scope.$on('close', function () {
@@ -43946,6 +44117,27 @@
                    CommandController.prototype.removeMySelf = function (index) {
                        this.remove()(index, this.list);
                    };
+                   CommandController.prototype.reloadFiles = function () {
+                       var _this = this;
+                       var fileId = this.workspace.fileId;
+                       this.APIEndPoint
+                           .getFiles(fileId)
+                           .$promise
+                           .then(function (result) {
+                           var status = result.status;
+                           if (status === 'success') {
+                               _this.files = result.info;
+                           }
+                           else {
+                               console.log(result.message);
+                           }
+                       });
+                   };
+                   CommandController.prototype.debug = function () {
+                       console.log(this.files);
+                       console.log(this.files);
+                       console.log(this.workspace);
+                   };
                    CommandController.$inject = ['APIEndPoint', '$scope'];
                    return CommandController;
                })();
@@ -44246,7 +44438,7 @@
                        return this.resource(endPoint).get();
                    };
                    APIEndPoint.prototype.getDirectories = function () {
-                       var endPoint = '/spi/v1/workspace/';
+                       var endPoint = '/api/v1/all/workspace/directory';
                        return this.resource(endPoint).get();
                    };
                    return APIEndPoint;
@@ -44314,15 +44506,18 @@
                        this.APIEndPoint = APIEndPoint;
                        this.$scope = $scope;
                        var controller = this;
-                       console.log(this.list);
                        this.APIEndPoint
                            .getOptionControlFile('dcdFilePrint')
                            .$promise
                            .then(function (result) {
-                           console.log(result);
                            controller.options = result.info;
                        });
-                       this.files = ['a.file', 'b.file', 'c.file'];
+                       this.APIEndPoint
+                           .getDirectories()
+                           .$promise
+                           .then(function (result) {
+                           controller.dirs = result.info;
+                       });
                        this.heading = "[" + this.index + "]: dcdFilePring";
                        this.isOpen = true;
                        this.$scope.$on('close', function () {
@@ -44347,6 +44542,27 @@
                    CommandController.prototype.removeMySelf = function (index) {
                        this.remove()(index, this.list);
                    };
+                   CommandController.prototype.reloadFiles = function () {
+                       var _this = this;
+                       var fileId = this.workspace.fileId;
+                       this.APIEndPoint
+                           .getFiles(fileId)
+                           .$promise
+                           .then(function (result) {
+                           var status = result.status;
+                           if (status === 'success') {
+                               _this.files = result.info;
+                           }
+                           else {
+                               console.log(result.message);
+                           }
+                       });
+                   };
+                   CommandController.prototype.debug = function () {
+                       console.log(this.files);
+                       console.log(this.files);
+                       console.log(this.workspace);
+                   };
                    CommandController.$inject = ['APIEndPoint', '$scope'];
                    return CommandController;
                })();
@@ -44647,7 +44863,7 @@
                        return this.resource(endPoint).get();
                    };
                    APIEndPoint.prototype.getDirectories = function () {
-                       var endPoint = '/spi/v1/workspace/';
+                       var endPoint = '/api/v1/all/workspace/directory';
                        return this.resource(endPoint).get();
                    };
                    return APIEndPoint;
@@ -44715,15 +44931,18 @@
                        this.APIEndPoint = APIEndPoint;
                        this.$scope = $scope;
                        var controller = this;
-                       console.log(this.list);
                        this.APIEndPoint
                            .getOptionControlFile('dcdFilePrint')
                            .$promise
                            .then(function (result) {
-                           console.log(result);
                            controller.options = result.info;
                        });
-                       this.files = ['a.file', 'b.file', 'c.file'];
+                       this.APIEndPoint
+                           .getDirectories()
+                           .$promise
+                           .then(function (result) {
+                           controller.dirs = result.info;
+                       });
                        this.heading = "[" + this.index + "]: dcdFilePring";
                        this.isOpen = true;
                        this.$scope.$on('close', function () {
@@ -44748,6 +44967,27 @@
                    CommandController.prototype.removeMySelf = function (index) {
                        this.remove()(index, this.list);
                    };
+                   CommandController.prototype.reloadFiles = function () {
+                       var _this = this;
+                       var fileId = this.workspace.fileId;
+                       this.APIEndPoint
+                           .getFiles(fileId)
+                           .$promise
+                           .then(function (result) {
+                           var status = result.status;
+                           if (status === 'success') {
+                               _this.files = result.info;
+                           }
+                           else {
+                               console.log(result.message);
+                           }
+                       });
+                   };
+                   CommandController.prototype.debug = function () {
+                       console.log(this.files);
+                       console.log(this.files);
+                       console.log(this.workspace);
+                   };
                    CommandController.$inject = ['APIEndPoint', '$scope'];
                    return CommandController;
                })();
@@ -45048,7 +45288,7 @@
                        return this.resource(endPoint).get();
                    };
                    APIEndPoint.prototype.getDirectories = function () {
-                       var endPoint = '/spi/v1/workspace/';
+                       var endPoint = '/api/v1/all/workspace/directory';
                        return this.resource(endPoint).get();
                    };
                    return APIEndPoint;
@@ -45116,15 +45356,18 @@
                        this.APIEndPoint = APIEndPoint;
                        this.$scope = $scope;
                        var controller = this;
-                       console.log(this.list);
                        this.APIEndPoint
                            .getOptionControlFile('dcdFilePrint')
                            .$promise
                            .then(function (result) {
-                           console.log(result);
                            controller.options = result.info;
                        });
-                       this.files = ['a.file', 'b.file', 'c.file'];
+                       this.APIEndPoint
+                           .getDirectories()
+                           .$promise
+                           .then(function (result) {
+                           controller.dirs = result.info;
+                       });
                        this.heading = "[" + this.index + "]: dcdFilePring";
                        this.isOpen = true;
                        this.$scope.$on('close', function () {
@@ -45149,6 +45392,27 @@
                    CommandController.prototype.removeMySelf = function (index) {
                        this.remove()(index, this.list);
                    };
+                   CommandController.prototype.reloadFiles = function () {
+                       var _this = this;
+                       var fileId = this.workspace.fileId;
+                       this.APIEndPoint
+                           .getFiles(fileId)
+                           .$promise
+                           .then(function (result) {
+                           var status = result.status;
+                           if (status === 'success') {
+                               _this.files = result.info;
+                           }
+                           else {
+                               console.log(result.message);
+                           }
+                       });
+                   };
+                   CommandController.prototype.debug = function () {
+                       console.log(this.files);
+                       console.log(this.files);
+                       console.log(this.workspace);
+                   };
                    CommandController.$inject = ['APIEndPoint', '$scope'];
                    return CommandController;
                })();

diff --git a/front-end/dist/templates/command.html b/front-end/dist/templates/command.html
index f9beaed..8b29d4f 100644 (file)
--- a/front-end/dist/templates/command.html
+++ b/front-end/dist/templates/command.html
@@ -1,21 +1,40 @@
 <div>
-    <uib-accordion-group heading="{{ctrl.heading}}" is-open="ctrl.isOpen" panel-class="panel-danger">
-        <uib-accordion-heading>
-            <h4 class="panel-title">
-                [{{ctrl.index}}: {{ctrl.name}}]
-                <button class="pull-right"
-                        ng-click="ctrl.removeMySelf(ctrl.index)">
-                    <span class="glyphicon glyphicon-remove"></span>
-                </button>
-            </h4>
-        </uib-accordion-heading>
-        <code>
-            <form ng-submit="ctrl.submit()">
-                <option info="o" files="ctrl.files"  ng-repeat="o in ctrl.options"></option>
-                <button type="submit" class="btn btn-default">
-                    Execute
-                </button>
-            </form>
-        </code>
+<uib-accordion-group heading="{{ctrl.heading}}" is-open="ctrl.isOpen" panel-class="panel-danger">
+    <uib-accordion-heading>
+    <h4 class="panel-title">
+        [{{ctrl.index}}: {{ctrl.name}}]
+        <button class="pull-right"
+                ng-click="ctrl.removeMySelf(ctrl.index)">
+            <span class="glyphicon glyphicon-remove"></span>
+        </button>
+    </h4>
+    </uib-accordion-heading>
+    <code>
+        <form class="form-horizontal" ng-submit="ctrl.submit()">
+            <ul class="list-inline">
+                <li>
+                    <label class="control-label">
+                        workspace
+                    </label>
+                    <select class="form-control"
+                            ng-options="dir.name for dir in ctrl.dirs"
+                            ng-model="ctrl.workspace"
+                            ng-change="ctrl.reloadFiles()"
+                            required>
+                    </select>
+                </li>
+            </ul>
+
+            <option info="o" files="ctrl.files"  ng-repeat="o in ctrl.options"></option>
+            <button type="submit" class="btn btn-default">
+                Execute
+            </button>
+
+            <button type="button" ng-click="ctrl.debug()" class="btn btn-default">
+                Debug
+            </button>
+
+        </form>
+    </code>
     </uib-accordion-group>
 </div>

diff --git a/front-end/dist/templates/option.html b/front-end/dist/templates/option.html
index 14096dd..082b66c 100644 (file)
--- a/front-end/dist/templates/option.html
+++ b/front-end/dist/templates/option.html
@@ -1,6 +1,6 @@
 <ul class="list-inline">
-    <li ng-repeat="arg in ctrl.info.arg">
-        <span ng-switch="arg.formType">
+<li ng-repeat="arg in ctrl.info.arg">
+    <span ng-switch="arg.formType">
         <span ng-switch-when="number">
             <label class="control-label">
                 {{arg.argName}}
@@ -11,17 +11,18 @@
                    ng-required="ctrl.info.optionProperties">
 
         </span>
-        <span ng-switch-when="text">
+        <span ng-switch-when="select">
             <label class="control-label">
                 {{arg.argName}}
             </label>
             <select class="form-control"
-                    ng-options="file for file in ctrl.files"
+                    ng-options="file.name for file in ctrl.files"
                     ng-model="arg.input"
                     ng-required="ctrl.info.optionProperties">
             </select>
         </span>
-        <span ng-switch-when="select">
+
+        <span ng-switch-when="text">
             <label class="control-label">
                 {{arg.argName}}
             </label>
@@ -30,6 +31,6 @@
                    ng-model="arg.input"
                    ng-required="ctrl.info.optionProperties">
         </span>
-        </p>
-    </li>
+    </span>
+</li>
 </ul>

diff --git a/server/api/v1/all/workspace/directory/index.js b/server/api/v1/all/workspace/directory/index.js
index befe924..901eec3 100644 (file)
--- a/server/api/v1/all/workspace/directory/index.js
+++ b/server/api/v1/all/workspace/directory/index.js
@@ -10,7 +10,11 @@ router.get('/', function(req, res) {
     console.log('hogehoge');
     db.getDirectories()
     .then(function(dirs) {
-        res.send(dirs);
+        var info = {
+            status: 'success',
+            info: dirs
+        }
+        res.send(info);
     })
 });