From a807035995931be6bd39a9785b62a0fdaf8f24cf Mon Sep 17 00:00:00 2001 From: Rishav Date: Mon, 3 Apr 2017 19:36:09 +0530 Subject: [PATCH] FBO department functionality, and update airport loader on every csv when uploaded --- app/index.html | 2 + app/scripts/config.js | 5 + app/scripts/controllers.js | 6 +- app/views/common/topnavbar.html | 4 +- app/views/fbo-Clients/fboClients.html | 2 +- app/views/login/login.service.js | 2 +- app/views/update-airports/update-airports.html | 40 ++- .../update-airports/updateAirportController.js | 35 ++- .../updateFBODept/updateFBODept.controller.js | 24 ++ app/views/updateFBODept/updateFBODept.html | 336 +++++++++++++++++++++ app/views/updateFBODept/updateFBODept.service.js | 39 +++ 11 files changed, 465 insertions(+), 30 deletions(-) create mode 100644 app/views/updateFBODept/updateFBODept.controller.js create mode 100644 app/views/updateFBODept/updateFBODept.html create mode 100644 app/views/updateFBODept/updateFBODept.service.js diff --git a/app/index.html b/app/index.html index df248f7..43c5349 100755 --- a/app/index.html +++ b/app/index.html @@ -117,6 +117,8 @@ + + diff --git a/app/scripts/config.js b/app/scripts/config.js index 3b0d435..255e290 100755 --- a/app/scripts/config.js +++ b/app/scripts/config.js @@ -48,6 +48,11 @@ function config($stateProvider, $urlRouterProvider) { templateUrl: "views/updateAllFBO/updateAllFBO.html", controller: 'updateAllFBOController' }) + .state('index.updateFBODept', { + url: "/updateFBODept/:id", + templateUrl: "views/updateFBODept/updateFBODept.html", + controller: 'updateFBODeptController' + }) .state('index.fboClients', { url: "/fboClients", templateUrl: "views/fbo-Clients/fboClients.html", diff --git a/app/scripts/controllers.js b/app/scripts/controllers.js index 7173d87..9bd476b 100755 --- a/app/scripts/controllers.js +++ b/app/scripts/controllers.js @@ -6,12 +6,16 @@ /** * MainCtrl - controller */ -function MainCtrl($scope, $location) { +function MainCtrl($scope, $location, LoginService) { $scope.userName = 'Dylan Goodwin'; $scope.helloText = 'Welcome in SeedProject'; $scope.descriptionText = 'It is an application skeleton for a typical AngularJS web app. You can use it to quickly bootstrap your angular webapp projects and dev environment for these projects.'; + $scope.logout = function(){ + console.log("Called") + LoginService.logout(); + } }; diff --git a/app/views/common/topnavbar.html b/app/views/common/topnavbar.html index 0e33f95..e45a0da 100755 --- a/app/views/common/topnavbar.html +++ b/app/views/common/topnavbar.html @@ -17,7 +17,7 @@ --> -