Commit 7379f005b5e49354337e2d3cb6d22a852b194b2e
1 parent
0a4eb77ccd
Exists in
master
FBO client page design implemented, get All fbo update fbo code implemented
Showing
23 changed files
with
1260 additions
and
41 deletions
Show diff stats
app/index.html
... | ... | @@ -27,6 +27,7 @@ |
27 | 27 | <link href="bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"> |
28 | 28 | <link href="styles/plugins/jQueryUI/jquery-ui-1.10.4.custom.min.css" rel="stylesheet"> |
29 | 29 | <link href="bower_components/jqGrid/css/ui.jqgrid.css" rel="stylesheet"> |
30 | + <link rel="stylesheet" href="bower_components/angular-loading-bar/build/loading-bar.min.css" type="text/css"> | |
30 | 31 | |
31 | 32 | <!-- Toastr --> |
32 | 33 | <link href="bower_components/toastr/toastr.min.css" rel="stylesheet"> |
... | ... | @@ -39,6 +40,7 @@ |
39 | 40 | <link href="styles/animate.css" rel="stylesheet"> |
40 | 41 | <link href="styles/style.css" rel="stylesheet"> |
41 | 42 | <link rel="stylesheet" type="text/css" href="plugins/iCheck/custom.css"> |
43 | + <link rel="stylesheet" type="text/css" href="plugins/dataTables/datatables.min.css"> | |
42 | 44 | <!-- endbuild --> |
43 | 45 | |
44 | 46 | |
... | ... | @@ -66,17 +68,25 @@ |
66 | 68 | <!-- SlimScroll --> |
67 | 69 | <script src="bower_components/jquery-slimscroll/jquery.slimscroll.min.js"></script> |
68 | 70 | |
71 | +<!-- inspinia --> | |
72 | +<script src="scripts/inspinia.js"></script> | |
73 | + | |
69 | 74 | <!-- Peace JS --> |
70 | 75 | <script src="bower_components/pace/pace.min.js"></script> |
71 | 76 | |
72 | 77 | <!-- Angular scripts--> |
73 | 78 | <script src="bower_components/angular/angular.min.js"></script> |
74 | 79 | <script src="bower_components/angular-ui-router/release/angular-ui-router.min.js"></script> |
80 | +<script src="bower_components/angular-cookies/angular-cookies.min.js"></script> | |
81 | +<script src="bower_components/angular-resource/angular-resource.min.js"></script> | |
82 | +<script src="bower_components/angular-animate/angular-animate.min.js"></script> | |
75 | 83 | <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script> |
76 | 84 | <script src="bower_components/jqGrid/js/i18n/grid.locale-en.js"></script> |
77 | 85 | <script src="bower_components/jqGrid/js/jquery.jqGrid.min.js"></script> |
78 | 86 | <script src="bower_components/ng-file-upload/ng-file-upload-shim.min.js"></script> |
79 | 87 | <script src="bower_components/ng-file-upload/ng-file-upload.min.js"></script> |
88 | +<script src="bower_components/angular-loading-bar/build/loading-bar.min.js"></script> | |
89 | + | |
80 | 90 | |
81 | 91 | <!-- Toastr scripts--> |
82 | 92 | <script src="bower_components/toastr/toastr.min.js"></script> |
... | ... | @@ -90,8 +100,9 @@ |
90 | 100 | |
91 | 101 | <!-- build:js({.tmp,app}) scripts/scripts.js --> |
92 | 102 | <!-- Custom and plugin javascript --> |
93 | -<script src="scripts/inspinia.js"></script> | |
103 | + | |
94 | 104 | <script src="plugins/iCheck/icheck.min.js"></script> |
105 | +<script src="plugins/dataTables/datatables.min.js"></script> | |
95 | 106 | |
96 | 107 | <!-- Anglar App Script --> |
97 | 108 | <script src="scripts/app.js"></script> |
... | ... | @@ -107,6 +118,11 @@ |
107 | 118 | <script src="views/update-airports/updateAirportService.js"></script> |
108 | 119 | <script src="views/login/login.service.js"></script> |
109 | 120 | <script src="views/login/login.controller.js"></script> |
121 | +<script src="views/getAllFBO/getAllFBO.controller.js"></script> | |
122 | +<script src="views/getAllFBO/getAllFBO.service.js"></script> | |
123 | +<script src="views/updateAllFBO/updateAllFBO.controller.js"></script> | |
124 | +<script src="views/updateAllFBO/updateAllFBO.service.js"></script> | |
125 | +<script src="views/fbo-Clients/fboClient.controller.js"></script> | |
110 | 126 | <!-- endbuild --> |
111 | 127 | |
112 | 128 | </body> | ... | ... |
app/plugins/dataTables/datatables.min.css
... | ... | @@ -0,0 +1,17 @@ |
1 | +/* | |
2 | + * This combined file was created by the DataTables downloader builder: | |
3 | + * https://datatables.net/download | |
4 | + * | |
5 | + * To rebuild or modify this file with the latest versions of the included | |
6 | + * software please visit: | |
7 | + * https://datatables.net/download/#bs/jszip-2.5.0/pdfmake-0.1.18/dt-1.10.13/b-1.2.3/b-html5-1.2.3/b-print-1.2.3 | |
8 | + * | |
9 | + * Included libraries: | |
10 | + * JSZip 2.5.0, pdfmake 0.1.18, DataTables 1.10.13, Buttons 1.2.3, HTML5 export 1.2.3, Print view 1.2.3 | |
11 | + */ | |
12 | + | |
13 | +table.dataTable{clear:both;margin-top:6px !important;margin-bottom:6px !important;max-width:none !important;border-collapse:separate !important}table.dataTable td,table.dataTable th{-webkit-box-sizing:content-box;box-sizing:content-box}table.dataTable td.dataTables_empty,table.dataTable th.dataTables_empty{text-align:center}table.dataTable.nowrap th,table.dataTable.nowrap td{white-space:nowrap}div.dataTables_wrapper div.dataTables_length label{font-weight:normal;text-align:left;white-space:nowrap}div.dataTables_wrapper div.dataTables_length select{width:75px;display:inline-block}div.dataTables_wrapper div.dataTables_filter{text-align:right}div.dataTables_wrapper div.dataTables_filter label{font-weight:normal;white-space:nowrap;text-align:left}div.dataTables_wrapper div.dataTables_filter input{margin-left:0.5em;display:inline-block;width:auto}div.dataTables_wrapper div.dataTables_info{padding-top:8px;white-space:nowrap}div.dataTables_wrapper div.dataTables_paginate{margin:0;white-space:nowrap;text-align:right}div.dataTables_wrapper div.dataTables_paginate ul.pagination{margin:2px 0;white-space:nowrap}div.dataTables_wrapper div.dataTables_processing{position:absolute;top:50%;left:50%;width:200px;margin-left:-100px;margin-top:-26px;text-align:center;padding:1em 0}table.dataTable thead>tr>th.sorting_asc,table.dataTable thead>tr>th.sorting_desc,table.dataTable thead>tr>th.sorting,table.dataTable thead>tr>td.sorting_asc,table.dataTable thead>tr>td.sorting_desc,table.dataTable thead>tr>td.sorting{padding-right:30px}table.dataTable thead>tr>th:active,table.dataTable thead>tr>td:active{outline:none}table.dataTable thead .sorting,table.dataTable thead .sorting_asc,table.dataTable thead .sorting_desc,table.dataTable thead .sorting_asc_disabled,table.dataTable thead .sorting_desc_disabled{cursor:pointer;position:relative}table.dataTable thead .sorting:after,table.dataTable thead .sorting_asc:after,table.dataTable thead .sorting_desc:after,table.dataTable thead .sorting_asc_disabled:after,table.dataTable thead .sorting_desc_disabled:after{position:absolute;bottom:8px;right:8px;display:block;font-family:'Glyphicons Halflings';opacity:0.5}table.dataTable thead .sorting:after{opacity:0.2;content:"\e150"}table.dataTable thead .sorting_asc:after{content:"\e155"}table.dataTable thead .sorting_desc:after{content:"\e156"}table.dataTable thead .sorting_asc_disabled:after,table.dataTable thead .sorting_desc_disabled:after{color:#eee}div.dataTables_scrollHead table.dataTable{margin-bottom:0 !important}div.dataTables_scrollBody table{border-top:none;margin-top:0 !important;margin-bottom:0 !important}div.dataTables_scrollBody table thead .sorting:after,div.dataTables_scrollBody table thead .sorting_asc:after,div.dataTables_scrollBody table thead .sorting_desc:after{display:none}div.dataTables_scrollBody table tbody tr:first-child th,div.dataTables_scrollBody table tbody tr:first-child td{border-top:none}div.dataTables_scrollFoot table{margin-top:0 !important;border-top:none}@media screen and (max-width: 767px){div.dataTables_wrapper div.dataTables_length,div.dataTables_wrapper div.dataTables_filter,div.dataTables_wrapper div.dataTables_info,div.dataTables_wrapper div.dataTables_paginate{text-align:center}}table.dataTable.table-condensed>thead>tr>th{padding-right:20px}table.dataTable.table-condensed .sorting:after,table.dataTable.table-condensed .sorting_asc:after,table.dataTable.table-condensed .sorting_desc:after{top:6px;right:6px}table.table-bordered.dataTable th,table.table-bordered.dataTable td{border-left-width:0}table.table-bordered.dataTable th:last-child,table.table-bordered.dataTable th:last-child,table.table-bordered.dataTable td:last-child,table.table-bordered.dataTable td:last-child{border-right-width:0}table.table-bordered.dataTable tbody th,table.table-bordered.dataTable tbody td{border-bottom-width:0}div.dataTables_scrollHead table.table-bordered{border-bottom-width:0}div.table-responsive>div.dataTables_wrapper>div.row{margin:0}div.table-responsive>div.dataTables_wrapper>div.row>div[class^="col-"]:first-child{padding-left:0}div.table-responsive>div.dataTables_wrapper>div.row>div[class^="col-"]:last-child{padding-right:0} | |
14 | + | |
15 | + | |
16 | +div.dt-button-info{position:fixed;top:50%;left:50%;width:400px;margin-top:-100px;margin-left:-200px;background-color:white;border:2px solid #111;box-shadow:3px 3px 8px rgba(0,0,0,0.3);border-radius:3px;text-align:center;z-index:21}div.dt-button-info h2{padding:0.5em;margin:0;font-weight:normal;border-bottom:1px solid #ddd;background-color:#f3f3f3}div.dt-button-info>div{padding:1em}ul.dt-button-collection.dropdown-menu{display:block;z-index:2002;-webkit-column-gap:8px;-moz-column-gap:8px;-ms-column-gap:8px;-o-column-gap:8px;column-gap:8px}ul.dt-button-collection.dropdown-menu.fixed{position:fixed;top:50%;left:50%;margin-left:-75px;border-radius:0}ul.dt-button-collection.dropdown-menu.fixed.two-column{margin-left:-150px}ul.dt-button-collection.dropdown-menu.fixed.three-column{margin-left:-225px}ul.dt-button-collection.dropdown-menu.fixed.four-column{margin-left:-300px}ul.dt-button-collection.dropdown-menu>*{-webkit-column-break-inside:avoid;break-inside:avoid}ul.dt-button-collection.dropdown-menu.two-column{width:300px;padding-bottom:1px;-webkit-column-count:2;-moz-column-count:2;-ms-column-count:2;-o-column-count:2;column-count:2}ul.dt-button-collection.dropdown-menu.three-column{width:450px;padding-bottom:1px;-webkit-column-count:3;-moz-column-count:3;-ms-column-count:3;-o-column-count:3;column-count:3}ul.dt-button-collection.dropdown-menu.four-column{width:600px;padding-bottom:1px;-webkit-column-count:4;-moz-column-count:4;-ms-column-count:4;-o-column-count:4;column-count:4}div.dt-button-background{position:fixed;top:0;left:0;width:100%;height:100%;z-index:2001}@media screen and (max-width: 767px){div.dt-buttons{float:none;width:100%;text-align:center;margin-bottom:0.5em}div.dt-buttons a.btn{float:none}} | |
17 | + | ... | ... |
app/plugins/dataTables/datatables.min.js
No preview for this file type
app/scripts/app.js
... | ... | @@ -4,11 +4,92 @@ |
4 | 4 | */ |
5 | 5 | (function () { |
6 | 6 | angular.module('inspinia', [ |
7 | - 'ui.router', // Routing | |
8 | - 'ui.bootstrap', // Bootstrap | |
9 | - 'ngFileUpload' // File Upload | |
7 | + 'ngCookies', // angular-cookies | |
8 | + 'ngResource', //angular resouce | |
9 | + 'ngAnimate', // angular animate | |
10 | + 'ui.router', // Routing | |
11 | + 'ui.bootstrap', // Bootstrap | |
12 | + 'ngFileUpload', // File Upload | |
13 | + 'angular-loading-bar' //angular loading bar | |
14 | + | |
10 | 15 | ]) |
11 | 16 | |
17 | + .config(['$httpProvider', function($httpProvider) { | |
18 | + $httpProvider.defaults.withCredentials = true; | |
19 | + $httpProvider.interceptors.push('myCSRF'); | |
20 | + $httpProvider.interceptors.push('httpRequestInterceptor'); | |
21 | + }]) | |
22 | + | |
23 | + | |
24 | + .factory('httpRequestInterceptor', ['$q', '$rootScope', '$location', function($q, $rootScope, $location) { | |
25 | + return { | |
26 | + request: function($config) { | |
27 | + return $config; | |
28 | + }, | |
29 | + responseError: function(rejection) { | |
30 | + if (rejection.status === 401) { | |
31 | + if($location.path() != "/login"){ | |
32 | + localStorage.clear(); | |
33 | + window.location.reload(); | |
34 | + } | |
35 | + } | |
36 | + return $q.reject(rejection); | |
37 | + } | |
38 | + } | |
39 | + }]) | |
40 | + | |
41 | + | |
42 | + // .run(function($rootScope, $window, $state, $location, LoginService) { | |
43 | + // $rootScope.$on('$stateChangeStart', function(event, next, nextParams, fromState) { | |
44 | + // var loginStatus = localStorage.getItem("loginStatus"); | |
45 | + // if (loginStatus == null) { | |
46 | + // if (next.url == "/login" || next.url == "/signup" || next.url == "/forgot-password") { | |
47 | + // // if route already going to #login, no redirect needed | |
48 | + // } else { | |
49 | + // // another route, we should redirect now | |
50 | + // $window.location.href = '#/login'; | |
51 | + // event.preventDefault(); | |
52 | + // } | |
53 | + // } else { | |
54 | + // if (next.name == 'login') { | |
55 | + // event.preventDefault(); | |
56 | + // if ($state.current.name.length == 0) { | |
57 | + // $state.go('app.upload'); | |
58 | + // } else { | |
59 | + // $state.go($state.current, {}, {reload: true}); | |
60 | + // } | |
61 | + // } | |
62 | + // } | |
63 | + // }); | |
64 | + // }) | |
65 | + | |
66 | + .provider('myCSRF',[function(){ | |
67 | + var headerName = 'X-CSRFToken'; | |
68 | + var cookieName = 'csrftoken'; | |
69 | + var allowedMethods = ['GET']; | |
70 | + | |
71 | + this.setHeaderName = function(n) { | |
72 | + headerName = n; | |
73 | + } | |
74 | + this.setCookieName = function(n) { | |
75 | + cookieName = n; | |
76 | + } | |
77 | + this.setAllowedMethods = function(n) { | |
78 | + allowedMethods = n; | |
79 | + } | |
80 | + this.$get = ['$cookies', function($cookies){ | |
81 | + return { | |
82 | + 'request': function(config) { | |
83 | + if(allowedMethods.indexOf(config.method) === -1) { | |
84 | + // do something on success | |
85 | + config.headers[headerName] = $cookies[cookieName]; | |
86 | + } | |
87 | + return config; | |
88 | + } | |
89 | + } | |
90 | + }]; | |
91 | + }]) | |
92 | + | |
12 | 93 | .directive('icheck', ['$timeout', '$parse', function($timeout, $parse) { |
13 | 94 | return { |
14 | 95 | restrict: 'A', | ... | ... |
app/scripts/config.js
... | ... | @@ -43,6 +43,21 @@ function config($stateProvider, $urlRouterProvider) { |
43 | 43 | templateUrl: "views/minor.html", |
44 | 44 | data: { pageTitle: 'Example view' } |
45 | 45 | }) |
46 | + .state('index.getAllFBO', { | |
47 | + url: "/getAllFBO", | |
48 | + templateUrl: "views/getAllFBO/getAllFBO.html", | |
49 | + controller: 'getAllFBOController' | |
50 | + }) | |
51 | + .state('index.updateFBO', { | |
52 | + url: "/updateFBO/:id", | |
53 | + templateUrl: "views/updateAllFBO/updateAllFBO.html", | |
54 | + controller: 'updateAllFBOController' | |
55 | + }) | |
56 | + .state('index.fboClients', { | |
57 | + url: "/fboClients", | |
58 | + templateUrl: "views/fbo-Clients/fboClients.html", | |
59 | + controller: 'fboClientsController' | |
60 | + }) | |
46 | 61 | } |
47 | 62 | angular |
48 | 63 | .module('inspinia') | ... | ... |
app/scripts/constant.js
... | ... | @@ -2,12 +2,7 @@ |
2 | 2 | 'use strict'; |
3 | 3 | |
4 | 4 | angular.module('inspinia') |
5 | - // .constant('CRM_URL', { | |
6 | - // userUrl: 'http://0.0.0.0:3000/api/users', | |
7 | - // leadUrl: 'http://0.0.0.0:3000/api/leads', | |
8 | - // agentUrl: 'http://0.0.0.0:3000/api/agents', | |
9 | - // contactUrl: 'http://0.0.0.0:3000/api/contactInfos', | |
10 | - // }) | |
5 | + | |
11 | 6 | .constant('BE', { |
12 | - url: 'http://192.168.1.226:8080/ws' | |
7 | + url: 'http://54.149.169.33:8080/ws' | |
13 | 8 | }); | ... | ... |
app/views/common/navigation.html
... | ... | @@ -31,6 +31,12 @@ |
31 | 31 | <li ui-sref-active="active"> |
32 | 32 | <a ui-sref="index.updateAirports"><i class="fa fa-map-marker"></i> <span class="nav-label">Update Airports</span></a> |
33 | 33 | </li> |
34 | + <li ui-sref-active="active"> | |
35 | + <a ui-sref="index.getAllFBO"><i class="fa fa-map-marker"></i> <span class="nav-label">Get All FBO</span></a> | |
36 | + </li> | |
37 | + <li ui-sref-active="active"> | |
38 | + <a ui-sref="index.fboClients"><i class="fa fa-map-marker"></i> <span class="nav-label">FBO Clients</span></a> | |
39 | + </li> | |
34 | 40 | </ul> |
35 | 41 | |
36 | 42 | </div> | ... | ... |
app/views/fbo-Clients/fboClient.controller.js
... | ... | @@ -0,0 +1,30 @@ |
1 | +'use strict'; | |
2 | + | |
3 | + //Load controller | |
4 | + angular.module('inspinia') | |
5 | + | |
6 | + .controller('fboClientsController', function($scope, $stateParams, UpdateAllFBO) { | |
7 | + $(document).ready(function(){ | |
8 | + $('.tab-pane').slimScroll({ | |
9 | + height: '600px' | |
10 | + }); | |
11 | + }); | |
12 | + | |
13 | + $scope.fboAdmin = function(){ | |
14 | + $('#tab-1').css('display', 'block'); | |
15 | + $('#tab-2').css('display', 'none'); | |
16 | + $('.customTab1').addClass('active'); | |
17 | + $('.customTab2').removeClass('active'); | |
18 | + $('.slimScrollDiv:first-child').css('display', 'block'); | |
19 | + | |
20 | + } | |
21 | + | |
22 | + $scope.fboDept = function(){ | |
23 | + $('#tab-1').css('display', 'none'); | |
24 | + $('#tab-2').css('display', 'block'); | |
25 | + $('.customTab2').addClass('active'); | |
26 | + $('.customTab1').removeClass('active'); | |
27 | + $('.slimScrollDiv:first-child').css('display', 'none'); | |
28 | + } | |
29 | + | |
30 | + }); | |
0 | 31 | \ No newline at end of file | ... | ... |
app/views/fbo-Clients/fboClients.html
... | ... | @@ -0,0 +1,359 @@ |
1 | +<div class="row wrapper border-bottom white-bg page-heading"> | |
2 | + <div class="col-lg-10"> | |
3 | + <h2>FBO Clients</h2> | |
4 | + <!-- <ol class="breadcrumb"> | |
5 | + <li> | |
6 | + <a href="index.dashboard">Home</a> | |
7 | + </li> | |
8 | + <li class="active"> | |
9 | + <strong>Clients</strong> | |
10 | + </li> | |
11 | + </ol> --> | |
12 | + </div> | |
13 | + <div class="col-lg-2"> | |
14 | + </div> | |
15 | +</div> | |
16 | +<div class="wrapper wrapper-content animated fadeInRight"> | |
17 | + <div class="row"> | |
18 | + <div class="col-sm-8"> | |
19 | + <div class="ibox"> | |
20 | + <div class="ibox-content"> | |
21 | + <span class="text-muted small pull-right"></span> | |
22 | + <h2>Clients</h2> | |
23 | + <!-- <p> | |
24 | + All clients need to be verified before you can send email and set a project. | |
25 | + </p> --> | |
26 | + <div class="input-group"> | |
27 | + <input type="text" placeholder="Search client " class="input form-control"> | |
28 | + <span class="input-group-btn"> | |
29 | + <button type="button" class="btn btn btn-primary"> <i class="fa fa-search"></i> Search</button> | |
30 | + </span> | |
31 | + </div> | |
32 | + <div class="clients-list"> | |
33 | + <ul class="nav nav-tabs"> | |
34 | + <span class="pull-right small text-muted">1406 Elements</span> | |
35 | + <li class="active customTab1"><a data-toggle="tab" ng-click="fboAdmin()"><i class="fa fa-user"></i> FBO Clients</a></li> | |
36 | + <li class="customTab2"><a data-toggle="tab" ng-click="fboDept()"><i class="fa fa-briefcase"></i> FBO Department Clients</a></li> | |
37 | + </ul> | |
38 | + <div class="tab-content"> | |
39 | + <div id="tab-1" class="tab-pane"> | |
40 | + <div class="full-height-scroll"> | |
41 | + <div class="table-responsive"> | |
42 | + <table class="table table-striped table-hover"> | |
43 | + <tbody> | |
44 | + <tr> | |
45 | + <td class="client-avatar"><img alt="image" src="img/a2.jpg"> </td> | |
46 | + <td><a data-toggle="tab" href="#contact-1" class="client-link">Anthony Jackson</a></td> | |
47 | + <td> Tellus Institute</td> | |
48 | + <td class="contact-type"><i class="fa fa-envelope"> </i></td> | |
49 | + <td> gravida@rbisit.com</td> | |
50 | + <td class="client-status"><span class="label label-primary">Active</span></td> | |
51 | + </tr> | |
52 | + <tr> | |
53 | + <td class="client-avatar"><img alt="image" src="img/a3.jpg"> </td> | |
54 | + <td><a data-toggle="tab" href="#contact-2" class="client-link">Rooney Lindsay</a></td> | |
55 | + <td>Proin Limited</td> | |
56 | + <td class="contact-type"><i class="fa fa-envelope"> </i></td> | |
57 | + <td> rooney@proin.com</td> | |
58 | + <td class="client-status"><span class="label label-primary">Active</span></td> | |
59 | + </tr> | |
60 | + <tr> | |
61 | + <td class="client-avatar"><img alt="image" src="img/a4.jpg"> </td> | |
62 | + <td><a data-toggle="tab" href="#contact-3" class="client-link">Lionel Mcmillan</a></td> | |
63 | + <td>Et Industries</td> | |
64 | + <td class="contact-type"><i class="fa fa-phone"> </i></td> | |
65 | + <td> +432 955 908</td> | |
66 | + <td class="client-status"></td> | |
67 | + </tr> | |
68 | + <tr> | |
69 | + <td class="client-avatar"><a href=""><img alt="image" src="img/a5.jpg"></a> </td> | |
70 | + <td><a data-toggle="tab" href="#contact-4" class="client-link">Edan Randall</a></td> | |
71 | + <td>Integer Sem Corp.</td> | |
72 | + <td class="contact-type"><i class="fa fa-phone"> </i></td> | |
73 | + <td> +422 600 213</td> | |
74 | + <td class="client-status"><span class="label label-warning">Waiting</span></td> | |
75 | + </tr> | |
76 | + <tr> | |
77 | + <td class="client-avatar"><a href=""><img alt="image" src="img/a6.jpg"></a> </td> | |
78 | + <td><a data-toggle="tab" href="#contact-2" class="client-link">Jasper Carson</a></td> | |
79 | + <td>Mone Industries</td> | |
80 | + <td class="contact-type"><i class="fa fa-phone"> </i></td> | |
81 | + <td> +400 468 921</td> | |
82 | + <td class="client-status"></td> | |
83 | + </tr> | |
84 | + <tr> | |
85 | + <td class="client-avatar"><a href=""><img alt="image" src="img/a7.jpg"></a> </td> | |
86 | + <td><a data-toggle="tab" href="#contact-3" class="client-link">Reuben Pacheco</a></td> | |
87 | + <td>Magna Associates</td> | |
88 | + <td class="contact-type"><i class="fa fa-envelope"> </i></td> | |
89 | + <td> pacheco@manga.com</td> | |
90 | + <td class="client-status"><span class="label label-info">Phoned</span></td> | |
91 | + </tr> | |
92 | + <tr> | |
93 | + <td class="client-avatar"><a href=""><img alt="image" src="img/a1.jpg"></a> </td> | |
94 | + <td><a data-toggle="tab" href="#contact-1" class="client-link">Simon Carson</a></td> | |
95 | + <td>Erat Corp.</td> | |
96 | + <td class="contact-type"><i class="fa fa-envelope"> </i></td> | |
97 | + <td> Simon@erta.com</td> | |
98 | + <td class="client-status"><span class="label label-primary">Active</span></td> | |
99 | + </tr> | |
100 | + <tr> | |
101 | + <td class="client-avatar"><a href=""><img alt="image" src="img/a3.jpg"></a> </td> | |
102 | + <td><a data-toggle="tab" href="#contact-2" class="client-link">Rooney Lindsay</a></td> | |
103 | + <td>Proin Limited</td> | |
104 | + <td class="contact-type"><i class="fa fa-envelope"> </i></td> | |
105 | + <td> rooney@proin.com</td> | |
106 | + <td class="client-status"><span class="label label-warning">Waiting</span></td> | |
107 | + </tr> | |
108 | + <tr> | |
109 | + <td class="client-avatar"><a href=""><img alt="image" src="img/a4.jpg"></a> </td> | |
110 | + <td><a data-toggle="tab" href="#contact-3" class="client-link">Lionel Mcmillan</a></td> | |
111 | + <td>Et Industries</td> | |
112 | + <td class="contact-type"><i class="fa fa-phone"> </i></td> | |
113 | + <td> +432 955 908</td> | |
114 | + <td class="client-status"></td> | |
115 | + </tr> | |
116 | + <tr> | |
117 | + <td class="client-avatar"><a href=""><img alt="image" src="img/a5.jpg"></a> </td> | |
118 | + <td><a data-toggle="tab" href="#contact-4" class="client-link">Edan Randall</a></td> | |
119 | + <td>Integer Sem Corp.</td> | |
120 | + <td class="contact-type"><i class="fa fa-phone"> </i></td> | |
121 | + <td> +422 600 213</td> | |
122 | + <td class="client-status"></td> | |
123 | + </tr> | |
124 | + <tr> | |
125 | + <td class="client-avatar"><a href=""><img alt="image" src="img/a2.jpg"></a> </td> | |
126 | + <td><a data-toggle="tab" href="#contact-1" class="client-link">Anthony Jackson</a></td> | |
127 | + <td> Tellus Institute</td> | |
128 | + <td class="contact-type"><i class="fa fa-envelope"> </i></td> | |
129 | + <td> gravida@rbisit.com</td> | |
130 | + <td class="client-status"><span class="label label-danger">Deleted</span></td> | |
131 | + </tr> | |
132 | + <tr> | |
133 | + <td class="client-avatar"><a href=""><img alt="image" src="img/a7.jpg"></a> </td> | |
134 | + <td><a data-toggle="tab" href="#contact-2" class="client-link">Reuben Pacheco</a></td> | |
135 | + <td>Magna Associates</td> | |
136 | + <td class="contact-type"><i class="fa fa-envelope"> </i></td> | |
137 | + <td> pacheco@manga.com</td> | |
138 | + <td class="client-status"><span class="label label-primary">Active</span></td> | |
139 | + </tr> | |
140 | + <tr> | |
141 | + <td class="client-avatar"><a href=""><img alt="image" src="img/a5.jpg"></a> </td> | |
142 | + <td><a data-toggle="tab" href="#contact-3"class="client-link">Edan Randall</a></td> | |
143 | + <td>Integer Sem Corp.</td> | |
144 | + <td class="contact-type"><i class="fa fa-phone"> </i></td> | |
145 | + <td> +422 600 213</td> | |
146 | + <td class="client-status"><span class="label label-info">Phoned</span></td> | |
147 | + </tr> | |
148 | + <tr> | |
149 | + <td class="client-avatar"><a href=""><img alt="image" src="img/a6.jpg"></a> </td> | |
150 | + <td><a data-toggle="tab" href="#contact-4" class="client-link">Jasper Carson</a></td> | |
151 | + <td>Mone Industries</td> | |
152 | + <td class="contact-type"><i class="fa fa-phone"> </i></td> | |
153 | + <td> +400 468 921</td> | |
154 | + <td class="client-status"><span class="label label-primary">Active</span></td> | |
155 | + </tr> | |
156 | + <tr> | |
157 | + <td class="client-avatar"><a href=""><img alt="image" src="img/a7.jpg"></a> </td> | |
158 | + <td><a data-toggle="tab" href="#contact-2" class="client-link">Reuben Pacheco</a></td> | |
159 | + <td>Magna Associates</td> | |
160 | + <td class="contact-type"><i class="fa fa-envelope"> </i></td> | |
161 | + <td> pacheco@manga.com</td> | |
162 | + <td class="client-status"><span class="label label-primary">Active</span></td> | |
163 | + </tr> | |
164 | + <tr> | |
165 | + <td class="client-avatar"><a href=""><img alt="image" src="img/a1.jpg"></a> </td> | |
166 | + <td><a data-toggle="tab" href="#contact-1" class="client-link">Simon Carson</a></td> | |
167 | + <td>Erat Corp.</td> | |
168 | + <td class="contact-type"><i class="fa fa-envelope"> </i></td> | |
169 | + <td> Simon@erta.com</td> | |
170 | + <td class="client-status"></td> | |
171 | + </tr> | |
172 | + <tr> | |
173 | + <td class="client-avatar"><a href=""><img alt="image" src="img/a3.jpg"></a> </td> | |
174 | + <td><a data-toggle="tab" href="#contact-3" class="client-link">Rooney Lindsay</a></td> | |
175 | + <td>Proin Limited</td> | |
176 | + <td class="contact-type"><i class="fa fa-envelope"> </i></td> | |
177 | + <td> rooney@proin.com</td> | |
178 | + <td class="client-status"></td> | |
179 | + </tr> | |
180 | + <tr> | |
181 | + <td class="client-avatar"><a href=""><img alt="image" src="img/a4.jpg"></a> </td> | |
182 | + <td><a data-toggle="tab" href="#contact-4" class="client-link">Lionel Mcmillan</a></td> | |
183 | + <td>Et Industries</td> | |
184 | + <td class="contact-type"><i class="fa fa-phone"> </i></td> | |
185 | + <td> +432 955 908</td> | |
186 | + <td class="client-status"><span class="label label-primary">Active</span></td> | |
187 | + </tr> | |
188 | + <tr> | |
189 | + <td class="client-avatar"><a href=""><img alt="image" src="img/a5.jpg"></a> </td> | |
190 | + <td><a data-toggle="tab" href="#contact-1" class="client-link">Edan Randall</a></td> | |
191 | + <td>Integer Sem Corp.</td> | |
192 | + <td class="contact-type"><i class="fa fa-phone"> </i></td> | |
193 | + <td> +422 600 213</td> | |
194 | + <td class="client-status"><span class="label label-info">Phoned</span></td> | |
195 | + </tr> | |
196 | + <tr> | |
197 | + <td class="client-avatar"><a href=""><img alt="image" src="img/a2.jpg"></a> </td> | |
198 | + <td><a data-toggle="tab" href="#contact-2" class="client-link">Anthony Jackson</a></td> | |
199 | + <td> Tellus Institute</td> | |
200 | + <td class="contact-type"><i class="fa fa-envelope"> </i></td> | |
201 | + <td> gravida@rbisit.com</td> | |
202 | + <td class="client-status"><span class="label label-warning">Waiting</span></td> | |
203 | + </tr> | |
204 | + <tr> | |
205 | + <td class="client-avatar"><a href=""><img alt="image" src="img/a7.jpg"></a> </td> | |
206 | + <td><a data-toggle="tab" href="#contact-4" class="client-link">Reuben Pacheco</a></td> | |
207 | + <td>Magna Associates</td> | |
208 | + <td class="contact-type"><i class="fa fa-envelope"> </i></td> | |
209 | + <td> pacheco@manga.com</td> | |
210 | + <td class="client-status"></td> | |
211 | + </tr> | |
212 | + </tbody> | |
213 | + </table> | |
214 | + </div> | |
215 | + </div> | |
216 | + </div> | |
217 | + <div id="tab-2" class="tab-pane"> | |
218 | + <div class="full-height-scroll"> | |
219 | + <div class="table-responsive"> | |
220 | + <table class="table table-striped table-hover"> | |
221 | + <tbody> | |
222 | + <tr> | |
223 | + <td><a data-toggle="tab" href="#company-1" class="client-link">Tellus Institute</a></td> | |
224 | + <td>Rexton</td> | |
225 | + <td><i class="fa fa-flag"></i> Angola</td> | |
226 | + <td class="client-status"><span class="label label-primary">Active</span></td> | |
227 | + </tr> | |
228 | + <tr> | |
229 | + <td><a data-toggle="tab" href="#company-2" class="client-link">Velit Industries</a></td> | |
230 | + <td>Maglie</td> | |
231 | + <td><i class="fa fa-flag"></i> Luxembourg</td> | |
232 | + <td class="client-status"><span class="label label-primary">Active</span></td> | |
233 | + </tr> | |
234 | + <tr> | |
235 | + <td><a data-toggle="tab" href="#company-3" class="client-link">Art Limited</a></td> | |
236 | + <td>Sooke</td> | |
237 | + <td><i class="fa fa-flag"></i> Philippines</td> | |
238 | + <td class="client-status"></td> | |
239 | + </tr> | |
240 | + <tr> | |
241 | + <td><a data-toggle="tab" href="#company-1" class="client-link">Tempor Arcu Corp.</a></td> | |
242 | + <td>Eisden</td> | |
243 | + <td><i class="fa fa-flag"></i> Korea, North</td> | |
244 | + <td class="client-status"><span class="label label-warning">Waiting</span></td> | |
245 | + </tr> | |
246 | + <tr> | |
247 | + <td><a data-toggle="tab" href="#company-2" class="client-link">Penatibus Consulting</a></td> | |
248 | + <td>Tribogna</td> | |
249 | + <td><i class="fa fa-flag"></i> Montserrat</td> | |
250 | + <td class="client-status"></td> | |
251 | + </tr> | |
252 | + <tr> | |
253 | + <td><a data-toggle="tab" href="#company-3" class="client-link"> Ultrices Incorporated</a></td> | |
254 | + <td>Basingstoke</td> | |
255 | + <td><i class="fa fa-flag"></i> Tunisia</td> | |
256 | + <td class="client-status"><span class="label label-primary">Active</span></td> | |
257 | + </tr> | |
258 | + <tr> | |
259 | + <td><a data-toggle="tab" href="#company-2" class="client-link">Et Arcu Inc.</a></td> | |
260 | + <td>Sioux City</td> | |
261 | + <td><i class="fa fa-flag"></i> Burundi</td> | |
262 | + <td class="client-status"><span class="label label-primary">Active</span></td> | |
263 | + </tr> | |
264 | + <tr> | |
265 | + <td><a data-toggle="tab" href="#company-1" class="client-link">Tellus Institute</a></td> | |
266 | + <td>Rexton</td> | |
267 | + <td><i class="fa fa-flag"></i> Angola</td> | |
268 | + <td class="client-status"><span class="label label-primary">Active</span></td> | |
269 | + </tr> | |
270 | + <tr> | |
271 | + <td><a data-toggle="tab" href="#company-2" class="client-link">Velit Industries</a></td> | |
272 | + <td>Maglie</td> | |
273 | + <td><i class="fa fa-flag"></i> Luxembourg</td> | |
274 | + <td class="client-status"></td> | |
275 | + </tr> | |
276 | + <tr> | |
277 | + <td><a data-toggle="tab" href="#company-3" class="client-link">Art Limited</a></td> | |
278 | + <td>Sooke</td> | |
279 | + <td><i class="fa fa-flag"></i> Philippines</td> | |
280 | + <td class="client-status"></td> | |
281 | + </tr> | |
282 | + <tr> | |
283 | + <td><a data-toggle="tab" href="#company-1" class="client-link">Tempor Arcu Corp.</a></td> | |
284 | + <td>Eisden</td> | |
285 | + <td><i class="fa fa-flag"></i> Korea, North</td> | |
286 | + <td class="client-status"><span class="label label-warning">Waiting</span></td> | |
287 | + </tr> | |
288 | + <tr> | |
289 | + <td><a data-toggle="tab" href="#company-2" class="client-link">Penatibus Consulting</a></td> | |
290 | + <td>Tribogna</td> | |
291 | + <td><i class="fa fa-flag"></i> Montserrat</td> | |
292 | + <td class="client-status"></td> | |
293 | + </tr> | |
294 | + <tr> | |
295 | + <td><a data-toggle="tab" href="#company-3" class="client-link"> Ultrices Incorporated</a></td> | |
296 | + <td>Basingstoke</td> | |
297 | + <td><i class="fa fa-flag"></i> Tunisia</td> | |
298 | + <td class="client-status"><span class="label label-primary">Active</span></td> | |
299 | + </tr> | |
300 | + <tr> | |
301 | + <td><a data-toggle="tab" href="#company-2" class="client-link">Et Arcu Inc.</a></td> | |
302 | + <td>Sioux City</td> | |
303 | + <td><i class="fa fa-flag"></i> Burundi</td> | |
304 | + <td class="client-status"><span class="label label-primary">Active</span></td> | |
305 | + </tr> | |
306 | + <tr> | |
307 | + <td><a data-toggle="tab" href="#company-1" class="client-link">Tellus Institute</a></td> | |
308 | + <td>Rexton</td> | |
309 | + <td><i class="fa fa-flag"></i> Angola</td> | |
310 | + <td class="client-status"><span class="label label-primary">Active</span></td> | |
311 | + </tr> | |
312 | + <tr> | |
313 | + <td><a data-toggle="tab" href="#company-2" class="client-link">Velit Industries</a></td> | |
314 | + <td>Maglie</td> | |
315 | + <td><i class="fa fa-flag"></i> Luxembourg</td> | |
316 | + <td class="client-status"></td> | |
317 | + </tr> | |
318 | + <tr> | |
319 | + <td><a data-toggle="tab" href="#company-3" class="client-link">Art Limited</a></td> | |
320 | + <td>Sooke</td> | |
321 | + <td><i class="fa fa-flag"></i> Philippines</td> | |
322 | + <td class="client-status"></td> | |
323 | + </tr> | |
324 | + <tr> | |
325 | + <td><a data-toggle="tab" href="#company-1" class="client-link">Tempor Arcu Corp.</a></td> | |
326 | + <td>Eisden</td> | |
327 | + <td><i class="fa fa-flag"></i> Korea, North</td> | |
328 | + <td class="client-status"><span class="label label-warning">Waiting</span></td> | |
329 | + </tr> | |
330 | + <tr> | |
331 | + <td><a data-toggle="tab" href="#company-2" class="client-link">Penatibus Consulting</a></td> | |
332 | + <td>Tribogna</td> | |
333 | + <td><i class="fa fa-flag"></i> Montserrat</td> | |
334 | + <td class="client-status"></td> | |
335 | + </tr> | |
336 | + <tr> | |
337 | + <td><a data-toggle="tab" href="#company-3" class="client-link"> Ultrices Incorporated</a></td> | |
338 | + <td>Basingstoke</td> | |
339 | + <td><i class="fa fa-flag"></i> Tunisia</td> | |
340 | + <td class="client-status"><span class="label label-primary">Active</span></td> | |
341 | + </tr> | |
342 | + <tr> | |
343 | + <td><a data-toggle="tab" href="#company-2" class="client-link">Et Arcu Inc.</a></td> | |
344 | + <td>Sioux City</td> | |
345 | + <td><i class="fa fa-flag"></i> Burundi</td> | |
346 | + <td class="client-status"><span class="label label-primary">Active</span></td> | |
347 | + </tr> | |
348 | + </tbody> | |
349 | + </table> | |
350 | + </div> | |
351 | + </div> | |
352 | + </div> | |
353 | + </div> | |
354 | + </div> | |
355 | + </div> | |
356 | + </div> | |
357 | + </div> | |
358 | + </div> | |
359 | +</div> | |
0 | 360 | \ No newline at end of file | ... | ... |
app/views/fbo-admin/dashboard.controller.js
... | ... | @@ -13,6 +13,7 @@ |
13 | 13 | |
14 | 14 | $scope.userName = 'Dylan Goodwin'; |
15 | 15 | $scope.essAccountId = true; |
16 | + $("#esAccId").css({ opacity: 0.5 }); | |
16 | 17 | $scope.user = {}; |
17 | 18 | $scope.feature = {}; |
18 | 19 | $scope.feature.level = 'silver'; |
... | ... | @@ -36,21 +37,29 @@ |
36 | 37 | console.log($scope.user) |
37 | 38 | var formdata = "email=" + $scope.user.email + "&username=" + $scope.user.username + "&firstName=" + $scope.user.firstName + "&lastName=" + $scope.user.lastName + "&password=" + $scope.user.password + "&phone=" + $scope.user.phone + "&mobile=" + $scope.user.mobile + "&status=" + $scope.user.status + "&userType=" + $scope.user.userType + "&clientNote=" + $scope.user.clientNote; |
38 | 39 | FBOAdmin.registerUser(formdata).then(function(result) { |
39 | - //console.log(result) | |
40 | - // $scope.feature.accountId = result; | |
41 | - // FBOAdmin.featureControl(formdata).then(function(response) { | |
42 | - // console.log(response) | |
40 | + console.log(result) | |
41 | + console.log(JSON.stringify(result)); | |
42 | + $scope.feature.accountId = result; | |
43 | + var featureControlData = "accountId=" + $scope.feature.accountId + "&level=" + $scope.feature.level + "&essintaPosSystem=" + $scope.feature.essintaPosSystem | |
44 | + + "&acuQuote=" + $scope.feature.acuQuote + "&acuTrack=" + $scope.feature.acuTrack + "&fuelProgram=" + $scope.feature.fuelProgram + "&amstatIntegration=" + $scope.feature.amstatIntegration+ "&posAccountingIntegration=" | |
45 | + + $scope.feature.posAccountingIntegration + "&posVeederRootIntegration=" + $scope.feature.posVeederRootIntegration | |
46 | + + "&essintaAccountUid=" + $scope.feature.essintaAccountUid + "&additionalLicences=" + $scope.feature.additionalLicences; | |
47 | + | |
48 | + FBOAdmin.featureControl(featureControlData).then(function(response) { | |
49 | + console.log(response) | |
43 | 50 | |
44 | - // }) | |
51 | + }) | |
45 | 52 | }) |
46 | 53 | } |
47 | 54 | |
48 | 55 | $scope.enableEssId = function(){ |
49 | 56 | if($scope.feature.essintaPosSystem == true){ |
50 | 57 | $scope.essAccountId = false; |
58 | + $("#esAccId").css({ opacity: 1 }); | |
51 | 59 | }else{ |
52 | 60 | $scope.essAccountId = true; |
53 | 61 | delete $scope.feature.essintaAccountUid; |
62 | + $("#esAccId").css({ opacity: 0.5 }); | |
54 | 63 | } |
55 | 64 | } |
56 | 65 | ... | ... |
app/views/fbo-admin/dashboard.html
... | ... | @@ -123,7 +123,7 @@ |
123 | 123 | </div> |
124 | 124 | <div class="col-lg-9" style="padding: 0;"> |
125 | 125 | <div class="col-lg-6"> |
126 | - <div class="form-group" style="margin-top: 18px;"> | |
126 | + <div class="form-group" style="margin-top: 18px;" id="esAccId"> | |
127 | 127 | <label class="control-label pull-left" style="color: #1ab394;line-height: 34px;">Essinta Account UID</label> |
128 | 128 | <div class="col-lg-6"> |
129 | 129 | <input type="text" placeholder="" ng-disabled="essAccountId" style="border-color: #1ab394;" class="form-control" ng-model="feature.essintaAccountUid"> | ... | ... |
app/views/fbo-admin/dashboard.service.js
app/views/fbo-flight/flight.html
... | ... | @@ -190,7 +190,7 @@ |
190 | 190 | </div> |
191 | 191 | <div class="col-xs-5 col-md-5 pull-right"> |
192 | 192 | <div class="form-group"> |
193 | - <label for="cardCVC">CV CODE</label> | |
193 | + <label for="cardCVC">CVV CODE</label> | |
194 | 194 | <input type="number" maxlength="3" oninput="javascript: if (this.value.length > this.maxLength) this.value = this.value.slice(0, this.maxLength);" class="form-control" name="cardCVC" placeholder="CVC" autocomplete="cc-csc" |
195 | 195 | required> |
196 | 196 | </div> |
... | ... | @@ -209,7 +209,7 @@ |
209 | 209 | </div> |
210 | 210 | <div class="row"> |
211 | 211 | <div class="col-xs-12"> |
212 | - <button class="btn btn-success btn-lg btn-block" type="submit">Add</button> | |
212 | + <button class="btn btn-success btn-lg btn-block" type="submit" ng-click="addCard()">Add</button> | |
213 | 213 | </div> |
214 | 214 | </div> |
215 | 215 | <div class="row" style="display:none;"> | ... | ... |
app/views/fbo-flight/flightDept.controller.js
... | ... | @@ -3,8 +3,8 @@ |
3 | 3 | //Load controller |
4 | 4 | angular.module('inspinia') |
5 | 5 | |
6 | - .controller('FlightDeptController', function ($scope, Registration) { | |
7 | - | |
6 | + .controller('FlightDeptController', function ($scope, FBOFlight) { | |
7 | + FBOFlight | |
8 | 8 | $(document).ready(function(){ |
9 | 9 | // Examle data for jqGrid |
10 | 10 | |
... | ... | @@ -75,13 +75,24 @@ |
75 | 75 | $scope.user.userType = 'flightDetp'; |
76 | 76 | console.log($scope.user) |
77 | 77 | var formdata = "email=" + $scope.user.email + "&username=" + $scope.user.username + "&firstName=" + $scope.user.firstName + "&lastName=" + $scope.user.lastName + "&password=" + $scope.user.password + "&phone=" + $scope.user.phone + "&mobile=" + $scope.user.mobile + "&status=" + $scope.user.status + "&userType=" + $scope.user.userType + "&clientNote=" + $scope.user.clientNote; |
78 | - Registration.registerUser(formdata).then(function(result) { | |
79 | - console.log(result) | |
78 | + FBOFlight.registerUser(formdata).then(function(result) { | |
79 | + $scope.registerId = result; | |
80 | + $scope.data.accountId = $scope.registerId; | |
80 | 81 | |
81 | 82 | }) |
82 | 83 | } |
83 | 84 | |
84 | 85 | $scope.data.cardType = 'creditCard'; |
86 | + var cardData = {} | |
87 | + cardData.paymentMethodList = []; | |
88 | + $scope.addCard = function(){ | |
89 | + cardData.paymentMethodList.push($scope.data); | |
90 | + console.log("cardData", cardData); | |
91 | + FBOFlight.addCardInformation(cardData).then(function(result) { | |
92 | + console.log(result) | |
93 | + | |
94 | + }) | |
95 | + } | |
85 | 96 | |
86 | 97 | |
87 | 98 | }); |
88 | 99 | \ No newline at end of file | ... | ... |
app/views/fbo-flight/flightDeptService.js
... | ... | @@ -2,16 +2,16 @@ |
2 | 2 | 'use strict'; |
3 | 3 | |
4 | 4 | angular.module('inspinia') |
5 | - .service('Registration', ['$rootScope', '$q', '$http', 'BE', Registration]) | |
5 | + .service('FBOFlight', ['$rootScope', '$q', '$http', 'BE', FBOFlight]) | |
6 | 6 | |
7 | - function Registration($rootScope, $q, $http, BE) { | |
7 | + function FBOFlight($rootScope, $q, $http, BE) { | |
8 | 8 | |
9 | 9 | this.registerUser = function(data) { |
10 | 10 | |
11 | 11 | var deferred = $q.defer(); |
12 | 12 | $http({ |
13 | 13 | method : 'POST', |
14 | - url : BE.url +'/account/registration', | |
14 | + url : BE.url +'/account/user/registration', | |
15 | 15 | headers : {'Content-Type': 'application/x-www-form-urlencoded'}, |
16 | 16 | data : data |
17 | 17 | }) |
... | ... | @@ -20,6 +20,21 @@ |
20 | 20 | }) |
21 | 21 | return deferred.promise; |
22 | 22 | } |
23 | + | |
24 | + this.addCardInformation = function(data) { | |
25 | + | |
26 | + var deferred = $q.defer(); | |
27 | + $http({ | |
28 | + method : 'POST', | |
29 | + url : BE.url +'/account/user/addPaymentMethods', | |
30 | + headers : {'Content-Type': 'application/json'}, | |
31 | + data : data | |
32 | + }) | |
33 | + .success(function(result) { | |
34 | + deferred.resolve(result); | |
35 | + }) | |
36 | + return deferred.promise; | |
37 | + } | |
23 | 38 | } |
24 | 39 | |
25 | 40 | })(); |
26 | 41 | \ No newline at end of file | ... | ... |
app/views/getAllFBO/getAllFBO.controller.js
... | ... | @@ -0,0 +1,43 @@ |
1 | +'use strict'; | |
2 | + | |
3 | + //Load controller | |
4 | + angular.module('inspinia') | |
5 | + | |
6 | + .controller('getAllFBOController', function($scope, GetAllFBO) { | |
7 | + $(document).ready(function(){ | |
8 | + $('.i-checks').iCheck({ | |
9 | + checkboxClass: 'icheckbox_square-green', | |
10 | + radioClass: 'iradio_square-green', | |
11 | + }); | |
12 | + | |
13 | + $('.dataTables-example').DataTable({ | |
14 | + pageLength: 25, | |
15 | + responsive: true, | |
16 | + dom: '<"html5buttons"B>lTfgitp', | |
17 | + buttons: [ | |
18 | + { extend: 'copy'}, | |
19 | + {extend: 'csv'}, | |
20 | + {extend: 'excel', title: 'ExampleFile'}, | |
21 | + {extend: 'pdf', title: 'ExampleFile'}, | |
22 | + | |
23 | + {extend: 'print', | |
24 | + customize: function (win){ | |
25 | + $(win.document.body).addClass('white-bg'); | |
26 | + $(win.document.body).css('font-size', '10px'); | |
27 | + | |
28 | + $(win.document.body).find('table') | |
29 | + .addClass('compact') | |
30 | + .css('font-size', 'inherit'); | |
31 | + } | |
32 | + } | |
33 | + ] | |
34 | + | |
35 | + }); | |
36 | + }); | |
37 | + | |
38 | + GetAllFBO.getALlFBOList().then(function(result) { | |
39 | + console.log(result) | |
40 | + $scope.fboList = result; | |
41 | + }) | |
42 | + | |
43 | + }); | |
0 | 44 | \ No newline at end of file | ... | ... |
app/views/getAllFBO/getAllFBO.html
... | ... | @@ -0,0 +1,83 @@ |
1 | +<div class="row wrapper border-bottom white-bg page-heading"> | |
2 | + <div class="col-lg-10"> | |
3 | + <h2>GET All FBO</h2> | |
4 | + <ol class="breadcrumb"> | |
5 | + <li> | |
6 | + <a href="index.dashboard">Home</a> | |
7 | + </li> | |
8 | + <li class="active"> | |
9 | + <strong>Get All FBO</strong> | |
10 | + </li> | |
11 | + </ol> | |
12 | + </div> | |
13 | + <div class="col-lg-2"> | |
14 | + </div> | |
15 | +</div> | |
16 | +<div class="wrapper wrapper-content animated fadeInRight"> | |
17 | + <div class="row"> | |
18 | + <div class="col-lg-12"> | |
19 | + <div class="ibox float-e-margins"> | |
20 | + <div class="ibox-title"> | |
21 | + <h5>FBO List</h5> | |
22 | + <!-- <div class="ibox-tools"> | |
23 | + <a class="collapse-link"> | |
24 | + <i class="fa fa-chevron-up"></i> | |
25 | + </a> | |
26 | + <a class="dropdown-toggle" data-toggle="dropdown" href="#"> | |
27 | + <i class="fa fa-wrench"></i> | |
28 | + </a> | |
29 | + <ul class="dropdown-menu dropdown-user"> | |
30 | + <li><a href="#">Config option 1</a> | |
31 | + </li> | |
32 | + <li><a href="#">Config option 2</a> | |
33 | + </li> | |
34 | + </ul> | |
35 | + <a class="close-link"> | |
36 | + <i class="fa fa-times"></i> | |
37 | + </a> | |
38 | + </div> --> | |
39 | + </div> | |
40 | + <div class="ibox-content"> | |
41 | + <div class="table-responsive"> | |
42 | + <table class="table table-striped table-bordered table-hover dataTables-example" > | |
43 | + <thead> | |
44 | + <tr> | |
45 | + <th>S. No</th> | |
46 | + <th>Name</th> | |
47 | + <th>Email</th> | |
48 | + <th>Phone</th> | |
49 | + <th>Level</th> | |
50 | + <th>Action</th> | |
51 | + </tr> | |
52 | + </thead> | |
53 | + <tbody> | |
54 | + <tr class="gradeX" ng-repeat="fbo in fboList"> | |
55 | + <td>{{$index +1}}</td> | |
56 | + <td>{{fbo.user.name}}</td> | |
57 | + <td>{{fbo.user.email}} | |
58 | + </td> | |
59 | + <td>{{fbo.user.phone}}</td> | |
60 | + <td class="center">{{fbo.user.accountFeatureControl.level}}</td> | |
61 | + <td> | |
62 | + <a ui-sref="index.updateFBO({id: fbo.user.id})"><i class="fa fa-pencil"></i></a> | |
63 | + <a href="" ng-click="deleteFBO(fbo.user.id)"><i class="fa fa-trash"></i></a> | |
64 | + </td> | |
65 | + </tr> | |
66 | + </tbody> | |
67 | + <tfoot> | |
68 | + <tr> | |
69 | + <th>S. No</th> | |
70 | + <th>Name</th> | |
71 | + <th>Email</th> | |
72 | + <th>Phone</th> | |
73 | + <th>Level</th> | |
74 | + <th>Action</th> | |
75 | + </tr> | |
76 | + </tfoot> | |
77 | + </table> | |
78 | + </div> | |
79 | + </div> | |
80 | + </div> | |
81 | + </div> | |
82 | + </div> | |
83 | +</div> | ... | ... |
app/views/getAllFBO/getAllFBO.service.js
... | ... | @@ -0,0 +1,25 @@ |
1 | +(function() { | |
2 | + 'use strict'; | |
3 | + | |
4 | + angular.module('inspinia') | |
5 | + .service('GetAllFBO', ['$rootScope', '$q', '$http', 'BE', GetAllFBO]) | |
6 | + | |
7 | + function GetAllFBO($rootScope, $q, $http, BE) { | |
8 | + | |
9 | + this.getALlFBOList = function(data) { | |
10 | + | |
11 | + var deferred = $q.defer(); | |
12 | + $http({ | |
13 | + method : 'GET', | |
14 | + url : BE.url +'/account/user/getAllFBOs', | |
15 | + headers : {'Content-Type': 'application/json'}, | |
16 | + }) | |
17 | + .success(function(result) { | |
18 | + deferred.resolve(result); | |
19 | + }) | |
20 | + return deferred.promise; | |
21 | + } | |
22 | + | |
23 | + } | |
24 | + | |
25 | +})(); | |
0 | 26 | \ No newline at end of file | ... | ... |
app/views/login/login.controller.js
... | ... | @@ -11,20 +11,22 @@ |
11 | 11 | var loginData = "username=" + $scope.user.username + "&password=" + $scope.user.password; |
12 | 12 | LoginService.loginUser(loginData).then(function(result) { |
13 | 13 | console.log(result) |
14 | + $state.go('index.dashboard'); | |
14 | 15 | //$state.go('index.dashboard'); |
15 | - if(typeof result == 'object') { | |
16 | - LoginService.authenticate(); | |
17 | - LoginService.setAuth(true); | |
18 | - $rootScope.path = true; | |
19 | - // var reqPwdChng = localStorage.getItem("requiredChangePwd"); | |
20 | - // if (reqPwdChng && reqPwdChng == "Y") { | |
21 | - // $state.go('resetPassword'); | |
22 | - // } else { | |
23 | - // $state.go('app.upload'); | |
24 | - // } | |
25 | - } else { | |
26 | - //toastr.info("Error in login. Please check login name and password"); | |
27 | - } | |
16 | + // if(typeof result == 'object') { | |
17 | + // // LoginService.authenticate(); | |
18 | + // // LoginService.setAuth(true); | |
19 | + // // $rootScope.path = true; | |
20 | + // $state.go('index.dashboard'); | |
21 | + // // var reqPwdChng = localStorage.getItem("requiredChangePwd"); | |
22 | + // // if (reqPwdChng && reqPwdChng == "Y") { | |
23 | + // // $state.go('resetPassword'); | |
24 | + // // } else { | |
25 | + // // $state.go('app.upload'); | |
26 | + // // } | |
27 | + // } else { | |
28 | + // //toastr.info("Error in login. Please check login name and password"); | |
29 | + // } | |
28 | 30 | }) |
29 | 31 | |
30 | 32 | } | ... | ... |
app/views/updateAllFBO/updateAllFBO.controller.js
... | ... | @@ -0,0 +1,28 @@ |
1 | +'use strict'; | |
2 | + | |
3 | + //Load controller | |
4 | + angular.module('inspinia') | |
5 | + | |
6 | + .controller('updateAllFBOController', function($scope, $stateParams, UpdateAllFBO) { | |
7 | + $(document).ready(function(){ | |
8 | + $('.i-checks').iCheck({ | |
9 | + checkboxClass: 'icheckbox_square-green', | |
10 | + radioClass: 'iradio_square-green', | |
11 | + }); | |
12 | + | |
13 | + }); | |
14 | + | |
15 | + var userProfileID = $stateParams.id; | |
16 | + UpdateAllFBO.getALlFBOData(userProfileID).then(function(result) { | |
17 | + console.log(result) | |
18 | + $scope.user = result; | |
19 | + $scope.feature = result.accountFeatureControl; | |
20 | + console.log($scope.feature,"dsdsdsds") | |
21 | + if($scope.user.account.user.status == 'ACTIVE'){ | |
22 | + $scope.status = true; | |
23 | + }else { | |
24 | + $scope.status = false; | |
25 | + } | |
26 | + }) | |
27 | + | |
28 | + }); | |
0 | 29 | \ No newline at end of file | ... | ... |
app/views/updateAllFBO/updateAllFBO.html
... | ... | @@ -0,0 +1,149 @@ |
1 | +</div> | |
2 | + <div class="row wrapper border-bottom white-bg page-heading"> | |
3 | + <div class="col-lg-8"> | |
4 | + <h2>Tellus Institute</h2> | |
5 | + </div> | |
6 | + <div class="col-lg-4" style="margin-top: 20px; text-align: right;"> | |
7 | + <button type="button" class="btn btn-default btn-sm">Cancel</button> | |
8 | + <button type="button" class="btn btn-primary btn-sm" ng-click="userData()">Save Changes</button> | |
9 | + </div> | |
10 | + </div> | |
11 | +</div> | |
12 | +<div class="wrapper wrapper-content animated fadeInRight"> | |
13 | + <div class="row"> | |
14 | + <div class="col-lg-7"> | |
15 | + <div class="ibox float-e-margins"> | |
16 | + <div class="ibox-title"> | |
17 | + <div class="pull-left"> | |
18 | + <h5>Contact Information</h5> | |
19 | + </div> | |
20 | + <div class="pull-right my-toggle-switch"> | |
21 | + <div class="switch"> | |
22 | + <div class="onoffswitch"> | |
23 | + <input type="checkbox" ng-checked="status === true" ng-model="status" ng-init="status = true" class="onoffswitch-checkbox" id="example1"> | |
24 | + <label class="onoffswitch-label" for="example1"> | |
25 | + <span class="onoffswitch-inner"></span> | |
26 | + <span class="onoffswitch-switch"></span> | |
27 | + </label> | |
28 | + </div> | |
29 | + </div> | |
30 | + </div> | |
31 | + <div class="clearfix"></div> | |
32 | + </div> | |
33 | + <div class="ibox-content"> | |
34 | + <div class="row"> | |
35 | + <form role="form"> | |
36 | + <div class="col-sm-6 b-r"> | |
37 | + <div class="form-group"><label>Username</label> <input type="email" placeholder="Email Username" ng-model="user.email" class="form-control"></div> | |
38 | + <div class="form-group"><label>First Name</label> <input type="text" placeholder="First Name" ng-model="user.firstName" class="form-control"></div> | |
39 | + <div class="form-group"><label>Last Name</label> <input type="text" placeholder="Last Name" ng-model="user.lastName" class="form-control"></div> | |
40 | + <!-- <div> | |
41 | + <button class="btn btn-sm btn-primary pull-right m-t-n-xs" type="submit"><strong>Log in</strong></button> | |
42 | + <label> <input type="checkbox" class="i-checks"> Remember me </label> | |
43 | + </div> --> | |
44 | + | |
45 | + </div> | |
46 | + <div class="col-sm-6"> | |
47 | + <div class="form-group"><label>Password</label> <input type="password" ng-model="user.password" placeholder="Password" class="form-control"></div> | |
48 | + <div class="form-group"><label>Phone</label> <input type="tel" ng-model="user.phone" placeholder="Phone" class="form-control"></div> | |
49 | + <div class="form-group"><label>Mobile</label> <input type="tel" ng-model="user.mobile" placeholder="Mobile" class="form-control"></div> | |
50 | + </div> | |
51 | + </form> | |
52 | + </div> | |
53 | + </div> | |
54 | + </div> | |
55 | + </div> | |
56 | + <div class="col-lg-5"> | |
57 | + <div class="ibox float-e-margins"> | |
58 | + <div class="ibox-title"> | |
59 | + <h5>Client Notes</h5> | |
60 | + | |
61 | + </div> | |
62 | + <div class="ibox-content"> | |
63 | + <div class="row"> | |
64 | + <form role="form"> | |
65 | + <textarea class="form-control" rows="10" ng-model="user.clientNote" id="comment"></textarea> | |
66 | + </form> | |
67 | + </div> | |
68 | + </div> | |
69 | + | |
70 | + </div> | |
71 | + </div> | |
72 | + </div> | |
73 | +</div> | |
74 | + | |
75 | +<div class="wrapper wrapper-content animated fadeInRight"> | |
76 | + <div class="row"> | |
77 | + <div class="col-lg-12"> | |
78 | + <div class="ibox float-e-margins"> | |
79 | + <div class="ibox-title" style="padding: 5px 15px 5px 15px;"> | |
80 | + <div class="col-lg-8"> | |
81 | + <h5 style="line-height: 34px;margin-bottom: 0;">Feature Account Control</h5> | |
82 | + </div> | |
83 | + <div class="col-lg-4"> | |
84 | + <div class="form-group"> | |
85 | + <label class="col-sm-2 control-label" style="line-height: 34px;margin-bottom: 0;">Level</label> | |
86 | + <div class="col-sm-10"> | |
87 | + <select class="form-control m-b" name="account" ng-model="feature.level" style="margin-bottom: 0;"> | |
88 | + <option value="silver" selected>Silver</option> | |
89 | + <option value="gold">Gold</option> | |
90 | + </select> | |
91 | + </div> | |
92 | + </div> | |
93 | + </div> | |
94 | + <div class="clearfix"></div> | |
95 | + </div> | |
96 | + <div class="ibox-content"> | |
97 | + <div class="row"> | |
98 | + <form role="form"> | |
99 | + | |
100 | + <div class="col-lg-3"> | |
101 | + <label style="color: #1ab394;">Modularized</label> | |
102 | + <div> | |
103 | + <label> <input type="checkbox" class="i-checks" ng-change="enableEssId()" ng-model="feature.essintaPosSystem" icheck> Essinta POS system </label> | |
104 | + </div> | |
105 | + <div> | |
106 | + <label> <input type="checkbox" class="i-checks" ng-model="feature.acuQuote" icheck> AcuQuote </label> | |
107 | + </div> | |
108 | + <div> | |
109 | + <label> <input type="checkbox" class="i-checks" ng-model="feature.acuTrack" icheck> AcuTrack </label> | |
110 | + </div> | |
111 | + <div> | |
112 | + <label> <input type="checkbox" class="i-checks" ng-model="feature.fuelProgram" icheck> Fuel Program </label> | |
113 | + </div> | |
114 | + <div> | |
115 | + <label> <input type="checkbox" class="i-checks" ng-model="feature.amstatIntegration" icheck> AMSTAT Integration </label> | |
116 | + </div> | |
117 | + <div> | |
118 | + <label> <input type="checkbox" class="i-checks" ng-model="feature.posAccountingIntegration" icheck> POS Accounting Integration </label> | |
119 | + </div> | |
120 | + <div> | |
121 | + <label> <input type="checkbox" class="i-checks" ng-model="feature.posVeederRootIntegration" icheck> POS VeederRoot Integration </label> | |
122 | + </div> | |
123 | + </div> | |
124 | + <div class="col-lg-9" style="padding: 0;"> | |
125 | + <div class="col-lg-6"> | |
126 | + <div class="form-group" style="margin-top: 18px;" id="esAccId"> | |
127 | + <label class="control-label pull-left" style="color: #1ab394;line-height: 34px;">Essinta Account UID</label> | |
128 | + <div class="col-lg-6"> | |
129 | + <input type="text" placeholder="" ng-disabled="essAccountId" style="border-color: #1ab394;" class="form-control" ng-model="feature.essintaAccountUid"> | |
130 | + </div> | |
131 | + </div> | |
132 | + </div> | |
133 | + <div class="col-lg-6"> | |
134 | + <div class="form-group" style="margin-top: 18px;"> | |
135 | + <label class="control-label pull-left" style="color: #ffa149;line-height: 34px;">Additional Device Licences</label> | |
136 | + <div class="col-lg-6"> | |
137 | + <input type="text" placeholder="" style="border-color: #ffa149 !important;" ng-model="feature.additionalLicences" class="form-control"> | |
138 | + </div> | |
139 | + </div> | |
140 | + </div> | |
141 | + </div> | |
142 | + | |
143 | + </form> | |
144 | + </div> | |
145 | + </div> | |
146 | + </div> | |
147 | + </div> | |
148 | + </div> | |
149 | +</div> | |
0 | 150 | \ No newline at end of file | ... | ... |
app/views/updateAllFBO/updateAllFBO.service.js
... | ... | @@ -0,0 +1,25 @@ |
1 | +(function() { | |
2 | + 'use strict'; | |
3 | + | |
4 | + angular.module('inspinia') | |
5 | + .service('UpdateAllFBO', ['$rootScope', '$q', '$http', 'BE', UpdateAllFBO]) | |
6 | + | |
7 | + function UpdateAllFBO($rootScope, $q, $http, BE) { | |
8 | + | |
9 | + this.getALlFBOData = function(id) { | |
10 | + | |
11 | + var deferred = $q.defer(); | |
12 | + $http({ | |
13 | + method : 'GET', | |
14 | + url : BE.url +'/account/user/'+id, | |
15 | + headers : {'Content-Type': 'application/json'}, | |
16 | + }) | |
17 | + .success(function(result) { | |
18 | + deferred.resolve(result); | |
19 | + }) | |
20 | + return deferred.promise; | |
21 | + } | |
22 | + | |
23 | + } | |
24 | + | |
25 | +})(); | |
0 | 26 | \ No newline at end of file | ... | ... |
bower.json
... | ... | @@ -34,7 +34,9 @@ |
34 | 34 | "jquery-slimscroll": "slimscroll#^1.3.8", |
35 | 35 | "jqGrid": "^5.2.0", |
36 | 36 | "ng-file-upload": "~12.2.13", |
37 | - "toastr": "~2.1.3" | |
37 | + "toastr": "~2.1.3", | |
38 | + "angular-cookies": "~1.5.0", | |
39 | + "angular-loading-bar": "~0.9.0" | |
38 | 40 | }, |
39 | 41 | "resolutions": { |
40 | 42 | "angular": "~1.5.0", | ... | ... |