diff options
author | Angel Avila | 2017-04-20 21:44:03 +0000 |
---|---|---|
committer | Angel Avila | 2017-04-21 20:04:24 +0000 |
commit | af28591ac2751d065e99a84a91c6801f94318ba0 (patch) | |
tree | 40e53aad6a19eb4bb1ce6526430fc47abb0755a8 | |
parent | c9ed16f4d9fb6b27ed757036f77e44f5b811f09a (diff) | |
download | org.eclipse.osee-fti.tar.gz org.eclipse.osee-fti.tar.xz org.eclipse.osee-fti.zip |
routing workingfti
Change-Id: Ie4137c0e913cbc11465303457c2385c72eff8d0e
10 files changed, 56 insertions, 32 deletions
diff --git a/plugins/org.eclipse.osee.web.ui/src/fti/css/app.css b/plugins/org.eclipse.osee.web.ui/src/fti/css/app.css index e30d00e23f5..4ed53cdeae3 100644 --- a/plugins/org.eclipse.osee.web.ui/src/fti/css/app.css +++ b/plugins/org.eclipse.osee.web.ui/src/fti/css/app.css @@ -21,4 +21,9 @@ } #searchInputDiv { display: inline-block -}
\ No newline at end of file +} + +.myGrid { + width: 500px; + height: 250px; + }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.web.ui/src/fti/js/ftiApp.js b/plugins/org.eclipse.osee.web.ui/src/fti/js/ftiApp.js index d2fb86a2693..506b1d83e98 100644 --- a/plugins/org.eclipse.osee.web.ui/src/fti/js/ftiApp.js +++ b/plugins/org.eclipse.osee.web.ui/src/fti/js/ftiApp.js @@ -1,4 +1,4 @@ -var app = angular.module('ftiApp', ['ngRoute', 'ngStorage', 'ngCookies', 'jsonforms', 'jsonforms-bootstrap', 'ui.bootstrap', 'ngResource']); +var app = angular.module('ftiApp', ['ngRoute', 'ngStorage', 'ngCookies', 'jsonforms', 'jsonforms-bootstrap', 'ui.bootstrap', 'ngResource', 'ui.grid']); app.config(['$routeProvider', function($routeProvider) { @@ -9,6 +9,9 @@ function($routeProvider) { }).when('/issue', { templateUrl: '/fti/views/issue_view.html', controller: 'tasksController as tc' + }).when('/program', { + templateUrl: '/fti/views/program.html', + controller: 'programController as pc' }) .otherwise({ redirectTo: "/" diff --git a/plugins/org.eclipse.osee.web.ui/src/fti/js/programController.js b/plugins/org.eclipse.osee.web.ui/src/fti/js/programController.js new file mode 100644 index 00000000000..4b29dd23001 --- /dev/null +++ b/plugins/org.eclipse.osee.web.ui/src/fti/js/programController.js @@ -0,0 +1,15 @@ +app.controller('programController', ['Task', '$route', function(Task, $route) { + var vm = this; + vm.programs = [{ name: "hello", id: "432"}, {name : "world", id: "422"}]; + vm.test = "h"; + + $route.current.params; + + vm.gridOptions = { + data: vm.programs, + columnDefs: [ + { name: 'name'}, + { name: 'id', cellTemplate: '<div class="ui-grid-cell-contents" title="TOOLTIP"><a href="#/issue?issueId={{row.entity.id}}">{{row.entity.id}}</a></div>'}, + ] + } +}]);
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.web.ui/src/fti/js/task.schema.js b/plugins/org.eclipse.osee.web.ui/src/fti/js/task.schema.js index 9e7aa54d985..36d75932e69 100644 --- a/plugins/org.eclipse.osee.web.ui/src/fti/js/task.schema.js +++ b/plugins/org.eclipse.osee.web.ui/src/fti/js/task.schema.js @@ -88,9 +88,6 @@ app.value("Schema", "COMM" ] }, - "disposition": { - "type": "string" - }, "id": { "type": "string" }, diff --git a/plugins/org.eclipse.osee.web.ui/src/fti/js/task.uischema.js b/plugins/org.eclipse.osee.web.ui/src/fti/js/task.uischema.js index a86baefb693..c12a62a776d 100644 --- a/plugins/org.eclipse.osee.web.ui/src/fti/js/task.uischema.js +++ b/plugins/org.eclipse.osee.web.ui/src/fti/js/task.uischema.js @@ -29,7 +29,7 @@ app.value("UISchema", }, { "type": "Control", - "label": "Linked MSA Issue ID", + "label": "Linked Apache Issue Id", "scope": { "$ref": "#/properties/msaIssueId" }, @@ -210,17 +210,6 @@ app.value("UISchema", "options": { "multi": true } - }, - { - "type": "Control", - "label": "Disposition", - "scope": { - "$ref": "#/properties/disposition" - }, - "readOnly": false, - "options": { - "multi": true - } } ] } diff --git a/plugins/org.eclipse.osee.web.ui/src/fti/js/tasksController.js b/plugins/org.eclipse.osee.web.ui/src/fti/js/tasksController.js index 7fabecc4e86..dd5c32f0cd1 100644 --- a/plugins/org.eclipse.osee.web.ui/src/fti/js/tasksController.js +++ b/plugins/org.eclipse.osee.web.ui/src/fti/js/tasksController.js @@ -2,7 +2,6 @@ app.controller('tasksController', ['Schema', 'UISchema', 'Tasks', 'Task', functi var vm = this; vm.taskSchema = Schema; vm.taskUISchema = UISchema; - vm.tasks=Tasks.query(); vm.dataLoaded=true; vm.taskData = Task; vm.temp = "dsf"; diff --git a/plugins/org.eclipse.osee.web.ui/src/fti/ui/index.html b/plugins/org.eclipse.osee.web.ui/src/fti/ui/index.html index 413342c4f5c..037a04785c6 100644 --- a/plugins/org.eclipse.osee.web.ui/src/fti/ui/index.html +++ b/plugins/org.eclipse.osee.web.ui/src/fti/ui/index.html @@ -8,6 +8,7 @@ <link rel="stylesheet" type="text/css" href="../css/app.css"> <link rel="stylesheet" href="/ajax/libs/node_modules2/bootstrap/dist/css/bootstrap.css"/> <link rel="stylesheet" href="/ajax/libs/node_modules2/jsonforms/dist/jsonforms-bootstrap.css"/> + <link rel="stylesheet" href="/ajax/libs/ui-grid/3.1.1/ui-grid.min.css"/> <script src="/ajax/libs/node_modules2/jsonforms/dist/jsonforms.js"></script> <script src="/ajax/libs/node_modules2/jsonforms/dist/jsonforms-bootstrap.js"></script> @@ -17,10 +18,12 @@ <script src="/ajax/libs/angularjs/1.3.11/angular-route.min.js"></script> <script src="/ajax/libs/angularjs/1.3.11/angular-cookies.js"></script> <script src="/ajax/libs/ngStorage/0.3.0/ngStorage.min.js"></script> - + <script src="/libs/js/support/linkRewrite.js"></script> + <script src="/ajax/libs/ui-grid/3.1.1/ui-grid.min.js"></script> <script src="../js/ftiApp.js"></script> <script src="../js/tasksController.js"></script> <script src="../js/landingController.js"></script> + <script src="../js/programController.js"></script> <script src="../js/task.schema.js"></script> <script src="../js/task.uischema.js"></script> <script src="../js/task.service.js"></script> @@ -40,12 +43,10 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="navbar-brand" href="#/issue">Issues</a> + <a class="navbar-brand" href="#/">Home</a> </div> - <p ng-dblclick="resetUserName()" class="navbar-text">Signed in as {{ cachedName }}</p> <div class="collapse navbar-collapse"> <ul class="nav navbar-nav navbar-right"> - <button id="helpButton" class="btn btn-info" ng-click="showHelpModal()">Help</button> </ul> </div> </div> diff --git a/plugins/org.eclipse.osee.web.ui/src/fti/views/issue_view.html b/plugins/org.eclipse.osee.web.ui/src/fti/views/issue_view.html index 9ffff798b9d..a6b548517ba 100644 --- a/plugins/org.eclipse.osee.web.ui/src/fti/views/issue_view.html +++ b/plugins/org.eclipse.osee.web.ui/src/fti/views/issue_view.html @@ -6,14 +6,8 @@ <div class="panel panel-primary"> <div class="panel-heading clearfix"> - <div class="btn-group pull-right" role="group"> - <button type="button" class="btn btn-default" aria-label="Save" ng-click="tc.save()"> - <span class="glyphicon glyphicon-ok" aria-hidden="false"></span> - <span>S{{ tc.temp }}</span> - </button> - </div> <h3 class="panel-title" style="line-height:34px;"> - <strong>Flight Test Issue {{ tc.temp }}</strong> + <strong>Flight Test Issue</strong> </h3> </div> diff --git a/plugins/org.eclipse.osee.web.ui/src/fti/views/landing.html b/plugins/org.eclipse.osee.web.ui/src/fti/views/landing.html index 3503b6158fe..0c9cf67c4fe 100644 --- a/plugins/org.eclipse.osee.web.ui/src/fti/views/landing.html +++ b/plugins/org.eclipse.osee.web.ui/src/fti/views/landing.html @@ -6,14 +6,14 @@ <div class="panel-heading clearfix"> <div class="btn-group pull-right" > <div id="searchLabelDiv"> - <label>Searh By ID:</label> + <label>Open Flight Test Issue By Id:</label> </div> <div id="searchInputDiv"> <input name="searchIdInput" id="searchIdInput" class="form-control"></input> </div> </div> <h3 class="panel-title" style="line-height:34px;"> - <strong>Programs {{ lc.test }}</strong> + <strong>Programs</strong> </h3> </div> @@ -21,7 +21,7 @@ <div> <ui> <li ng-repeat="program in lc.programs"> - <a href="program?={{ program.id }}">{{ program.name }}</a> + <a href="#/program?programId={{ program.id }}">{{ program.name }}</a> </li> </ui> </div> diff --git a/plugins/org.eclipse.osee.web.ui/src/fti/views/program.html b/plugins/org.eclipse.osee.web.ui/src/fti/views/program.html new file mode 100644 index 00000000000..e60dc7db9be --- /dev/null +++ b/plugins/org.eclipse.osee.web.ui/src/fti/views/program.html @@ -0,0 +1,21 @@ +<div class="panel panel-primary"> + <div class="panel-body"> + <div class="row"> + <div class="col-lg-12"> + <div class="panel panel-primary"> + <div class="panel-heading clearfix"> + <h3 class="panel-title" style="line-height:34px;"> + <strong>Issues {{ pc.test }}</strong> + </h3> + </div> + + <div class="panel-body jsf" style="line-height: 2.0"> + <div> + <div id="grid1" ui-grid="pc.gridOptions" class="grid"></div> + </div> + </div> + </div> + </div> + </div> + </div> +</div>
\ No newline at end of file |