viithiisys / Acufuel

Download as
Browse Code ยป

Commit bfb1a2a4617a6d78aa5aeabd6dadfd02600db710

Authored by Kuldeep Arora
1 parent da40330c81
Exists in master

flight tracking page manually reload

Showing 2 changed files with 7 additions and 4 deletions   Show diff stats
app/partials/main/main.controller.js
Diff comments   View file @bfb1a2a
1 1
2 (function() { 2 (function() {
3 'use strict' 3 'use strict'
4 4
5 angular.module('acufuel') 5 angular.module('acufuel')
6 .controller('MainController', [ '$scope', '$filter','$rootScope','$state', '$window', MainController]); 6 .controller('MainController', [ '$scope', '$filter','$rootScope','$state', '$window', MainController]);
7 7
8 function MainController($scope, $filter, $rootScope,$state, $window) { 8 function MainController($scope, $filter, $rootScope,$state, $window) {
9 9
10 $scope.currentUserName = JSON.parse(localStorage.getItem('currentUserName')); 10 $scope.currentUserName = JSON.parse(localStorage.getItem('currentUserName'));
11 console.log("$state====",$state) 11 console.log("$state====",$state)
12 12
13 // Flight Tracking page code 13 // Flight Tracking page code
14 14
15 $scope.reloadPage = function(){ 15 /*$scope.reloadPage = function(){
16 console.log("if",$state) 16 console.log("if",$state)
17 console.log("=========state name",$state.current.name); 17 console.log("=========state name",$state.current.name);
18 // $state.go('app.flightTracking', {}, {reload: 'app.flightTracking'}) 18 // $state.go('app.flightTracking', {}, {reload: 'app.flightTracking'})
19 //$state.go($state.current, {}, {reload: true}); 19 //$state.go($state.current, {}, {reload: true});
20 20
21 if($state.current.name != "app.flightTracking"){ 21 if($state.current.name != "app.flightTracking"){
22 $window.location.href = '/flightTracking'; 22 $window.location.href = '/#!/flightTracking';
23 setInterval(function(){ 23 setInterval(function(){
24 console.log("come") 24 console.log("come")
25 $window.location.reload() 25 $window.location.reload()
26 },10); 26 },10);
27 }else{ 27 }else{
28 console.log("flight tracking state found====="); 28 console.log("flight tracking state found=====");
29 $window.location.reload(); 29 $window.location.reload();
30 } 30 }
31 } 31 }*/
32
33
32 } 34 }
33 35
34 })(); 36 })();
35 37
36 38
app/partials/main/main.html
Diff comments   View file @bfb1a2a
1 <nav class="navbar navbar-inverse" role="navigation"> 1 <nav class="navbar navbar-inverse" role="navigation">
2 <div class="container"> 2 <div class="container">
3 <!-- Brand and toggle get grouped for better mobile display --> 3 <!-- Brand and toggle get grouped for better mobile display -->
4 <div class="navbar-header"> 4 <div class="navbar-header">
5 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse"> 5 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
6 <span class="sr-only">Toggle navigation</span> 6 <span class="sr-only">Toggle navigation</span>
7 <i class="icon-cog"></i> 7 <i class="icon-cog"></i>
8 </button> 8 </button>
9 <a class="navbar-brand" ui-sref="app.dashboard"> 9 <a class="navbar-brand" ui-sref="app.dashboard">
10 <img src="./img/acufuelLOGOwhite.png" class="img-logo"> 10 <img src="./img/acufuelLOGOwhite.png" class="img-logo">
11 </a> 11 </a>
12 </div> 12 </div>
13 <!-- Collect the nav links, forms, and other content for toggling --> 13 <!-- Collect the nav links, forms, and other content for toggling -->
14 <div class="collapse navbar-collapse navbar-ex1-collapse"> 14 <div class="collapse navbar-collapse navbar-ex1-collapse">
15 <ul class="nav navbar-nav navbar-right"> 15 <ul class="nav navbar-nav navbar-right">
16 <li class="dropdown"> 16 <li class="dropdown">
17 <a href="javscript:;" class="dropdown-toggle" data-toggle="dropdown"> 17 <a href="javscript:;" class="dropdown-toggle" data-toggle="dropdown">
18 <i class="icon-plane"></i> 18 <i class="icon-plane"></i>
19 {{currentUserName}} 19 {{currentUserName}}
20 <b class="caret"></b> 20 <b class="caret"></b>
21 </a> 21 </a>
22 <ul class="dropdown-menu"> 22 <ul class="dropdown-menu">
23 <li ng-if="!isAuthenticated"><a href="javascript:;">My Profile</a></li> 23 <li ng-if="!isAuthenticated"><a href="javascript:;">My Profile</a></li>
24 <li ng-if="isAuthenticated"><a ui-sref="app.accountSetting">Account Settings</a></li> 24 <li ng-if="isAuthenticated"><a ui-sref="app.accountSetting">Account Settings</a></li>
25 <li class="divider"></li> 25 <li class="divider"></li>
26 <li><a href="#" ng-click="logout();">Logout</a></li> 26 <li><a href="#" ng-click="logout();">Logout</a></li>
27 </ul> 27 </ul>
28 </li> 28 </li>
29 </ul> 29 </ul>
30 </div> 30 </div>
31 <!-- /.navbar-collapse --> 31 <!-- /.navbar-collapse -->
32 </div> 32 </div>
33 <!-- /.container --> 33 <!-- /.container -->
34 </nav> 34 </nav>
35 <div class="subnavbar"> 35 <div class="subnavbar">
36 <div class="subnavbar-inner"> 36 <div class="subnavbar-inner">
37 <div class="container"> 37 <div class="container">
38 <a href="javascript:;" class="subnav-toggle" data-toggle="collapse" data-target=".subnav-collapse"> 38 <a href="javascript:;" class="subnav-toggle" data-toggle="collapse" data-target=".subnav-collapse">
39 <span class="sr-only">Toggle navigation</span> 39 <span class="sr-only">Toggle navigation</span>
40 <i class="icon-reorder"></i> 40 <i class="icon-reorder"></i>
41 </a> 41 </a>
42 <div class="collapse subnav-collapse"> 42 <div class="collapse subnav-collapse">
43 <ul class="mainnav"> 43 <ul class="mainnav">
44 <li ng-if="isAuthenticated"> 44 <li ng-if="isAuthenticated">
45 <a ui-sref="app.dashboard"> 45 <a ui-sref="app.dashboard">
46 <i class="fa fa-home"></i> 46 <i class="fa fa-home"></i>
47 <span>Home</span> 47 <span>Home</span>
48 </a> 48 </a>
49 </li> 49 </li>
50 <li class="dropdown" ng-if="isAuthenticated"> 50 <li class="dropdown" ng-if="isAuthenticated">
51 <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown"> 51 <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown">
52 <i class="fa fa-tint"></i> 52 <i class="fa fa-tint"></i>
53 <span>Fuel Manager</span> 53 <span>Fuel Manager</span>
54 <b class="caret"></b> 54 <b class="caret"></b>
55 </a> 55 </a>
56 <ul class="dropdown-menu"> 56 <ul class="dropdown-menu">
57 <li><a ui-sref="app.updateFuelManager" href="#/updateFuelManager">Update Fuel Manager</a></li> 57 <li><a ui-sref="app.updateFuelManager" href="#/updateFuelManager">Update Fuel Manager</a></li>
58 <li> 58 <li>
59 <a ui-sref="app.enterFuelOrder">Enter Fuel Order</a> 59 <a ui-sref="app.enterFuelOrder">Enter Fuel Order</a>
60 </li> 60 </li>
61 <li><a ui-sref="app.fuelManager" href="#/fuelManager">Ramp Free Manager</a></li> 61 <li><a ui-sref="app.fuelManager" href="#/fuelManager">Ramp Free Manager</a></li>
62 <li class="dropdown-submenu"> 62 <li class="dropdown-submenu">
63 <a tabindex="-1" >Tax Manager</a> 63 <a tabindex="-1" >Tax Manager</a>
64 <ul class="dropdown-menu"> 64 <ul class="dropdown-menu">
65 <li><a tabindex="-1" ui-sref="app.taxes" href="#/taxes">Federal Taxes</a></li> 65 <li><a tabindex="-1" ui-sref="app.taxes" href="#/taxes">Federal Taxes</a></li>
66 <li><a ui-sref="app.taxes" href="#/taxes">State & Country Taxes</a></li> 66 <li><a ui-sref="app.taxes" href="#/taxes">State & Country Taxes</a></li>
67 <li><a ui-sref="app.taxes" href="#/taxes">Airport Taxes</a></li> 67 <li><a ui-sref="app.taxes" href="#/taxes">Airport Taxes</a></li>
68 </ul> 68 </ul>
69 </li> 69 </li>
70 <li ng-if="isAuthenticated"> 70 <li ng-if="isAuthenticated">
71 <a ui-sref="app.fuelOrders" href="#/fuelOrders"> 71 <a ui-sref="app.fuelOrders" href="#/fuelOrders">
72 Fuel Orders 72 Fuel Orders
73 </a> 73 </a>
74 </li> 74 </li>
75 </ul> 75 </ul>
76 </li> 76 </li>
77 <li class="dropdown" ng-if="isAuthenticated"> 77 <li class="dropdown" ng-if="isAuthenticated">
78 <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown"> 78 <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown">
79 <i class="fa fa-user"></i> 79 <i class="fa fa-user"></i>
80 <span>Accounts</span> 80 <span>Accounts</span>
81 <b class="caret"></b> 81 <b class="caret"></b>
82 </a> 82 </a>
83 <ul class="dropdown-menu"> 83 <ul class="dropdown-menu">
84 <!-- <li><a ui-sref="app.viewCompany">View Companies</a></li> --> 84 <!-- <li><a ui-sref="app.viewCompany">View Companies</a></li> -->
85 <li><a ui-sref="app.customers">View Customers</a></li> 85 <li><a ui-sref="app.customers">View Customers</a></li>
86 <li><a ui-sref="app.account">View Fuel Vendors</a></li> 86 <li><a ui-sref="app.account">View Fuel Vendors</a></li>
87 <li><a ui-sref="app.analytics">Lookup Flight Dept</a></li> 87 <li><a ui-sref="app.analytics">Lookup Flight Dept</a></li>
88 </ul> 88 </ul>
89 </li> 89 </li>
90 <li ng-if="isAuthenticated"> 90 <li ng-if="isAuthenticated">
91 <a ui-sref="app.scheduler"> 91 <a ui-sref="app.scheduler">
92 <i class="fa fa-calendar"></i> 92 <i class="fa fa-calendar"></i>
93 <span>Scheduler</span> 93 <span>Scheduler</span>
94 </a> 94 </a>
95 </li> 95 </li>
96 <li class="dropdown" ng-if="isAuthenticated"> 96 <li class="dropdown" ng-if="isAuthenticated">
97 <a href="app.analytics:;" class="dropdown-toggle" data-toggle="dropdown"> 97 <a href="app.analytics:;" class="dropdown-toggle" data-toggle="dropdown">
98 <i class="fa fa-signal"></i> 98 <i class="fa fa-signal"></i>
99 <span>Analytics</span> 99 <span>Analytics</span>
100 <b class="caret"></b> 100 <b class="caret"></b>
101 </a> 101 </a>
102 <ul class="dropdown-menu"> 102 <ul class="dropdown-menu">
103 <!-- <li><a href="#">Live Flight tracking</a></li> --> 103 <!-- <li><a href="#">Live Flight tracking</a></li> -->
104 <li><a href="#">Historical Fuel Prices</a></li> 104 <li><a href="#">Historical Fuel Prices</a></li>
105 <li><a href="#">Regional Pricing</a></li> 105 <li><a href="#">Regional Pricing</a></li>
106 <li><a href="#">Actual vs. Canceled Fuelings</a></li> 106 <li><a href="#">Actual vs. Canceled Fuelings</a></li>
107 <li><a href="#">Customer Lead Sources</a></li> 107 <li><a href="#">Customer Lead Sources</a></li>
108 </ul> 108 </ul>
109 </li> 109 </li>
110 <li ng-if="isAuthenticated"> 110 <li ng-if="isAuthenticated">
111 <a ui-sref="app.flightTracking()" ng-click="reloadPage()" data-ui-sref-opts="{reload:false}" > 111 <!-- <a ui-sref="app.flightTracking()" ng-click="reloadPage()" data-ui-sref-opts="{reload:false}"> -->
112 <a ui-sref="app.flightTracking">
112 <i class="fa fa-plane"></i> 113 <i class="fa fa-plane"></i>
113 <span>Flight Tracking</span> 114 <span>Flight Tracking</span>
114 </a> 115 </a>
115 </li> 116 </li>
116 <li ng-if="!isAuthenticated"> 117 <li ng-if="!isAuthenticated">
117 <a ui-sref="app.flightDepDashboard"> 118 <a ui-sref="app.flightDepDashboard">
118 <i class="fa fa-search"></i> 119 <i class="fa fa-search"></i>
119 <span>Search Fuel</span> 120 <span>Search Fuel</span>
120 </a> 121 </a>
121 </li> 122 </li>
122 <li class="dropdown" ng-if="!isAuthenticated"> 123 <li class="dropdown" ng-if="!isAuthenticated">
123 <a ui-sref="app.flightDepOrders" class="dropdown-toggle" data-toggle="dropdown"> 124 <a ui-sref="app.flightDepOrders" class="dropdown-toggle" data-toggle="dropdown">
124 <i class="fa fa-tint"></i> 125 <i class="fa fa-tint"></i>
125 <span>Fuel Orders</span> 126 <span>Fuel Orders</span>
126 </a> 127 </a>
127 </li> 128 </li>
128 </ul> 129 </ul>
129 </div> 130 </div>
130 <!-- /.subnav-collapse --> 131 <!-- /.subnav-collapse -->
131 </div> 132 </div>
132 <!-- /container --> 133 <!-- /container -->
133 </div> 134 </div>
134 <!-- /subnavbar-inner --> 135 <!-- /subnavbar-inner -->
135 </div> 136 </div>
136 <!-- /subnavbar --> 137 <!-- /subnavbar -->
137 <div ui-view></div> 138 <div ui-view></div>
138 <!-- </body> --> 139 <!-- </body> -->
139 <!-- footer --> 140 <!-- footer -->
140 <div class="extra"> 141 <div class="extra">
141 <div class="container"> 142 <div class="container">
142 <div class="row"> 143 <div class="row">
143 <div class="col-md-3"> 144 <div class="col-md-3">
144 <h4>About</h4> 145 <h4>About</h4>
145 <ul> 146 <ul>
146 <li><a href="javascript:;">About Us</a></li> 147 <li><a href="javascript:;">About Us</a></li>
147 <li><a href="javascript:;">Twitter</a></li> 148 <li><a href="javascript:;">Twitter</a></li>
148 <li><a href="javascript:;">Facebook</a></li> 149 <li><a href="javascript:;">Facebook</a></li>
149 <li><a href="javascript:;">Google+</a></li> 150 <li><a href="javascript:;">Google+</a></li>
150 </ul> 151 </ul>
151 </div> 152 </div>
152 <!-- /span3 --> 153 <!-- /span3 -->
153 <div class="col-md-3"> 154 <div class="col-md-3">
154 <h4>Support</h4> 155 <h4>Support</h4>
155 <ul> 156 <ul>
156 <li><a href="javascript:;">Frequently Asked Questions</a></li> 157 <li><a href="javascript:;">Frequently Asked Questions</a></li>
157 <li><a href="javascript:;">Ask a Question</a></li> 158 <li><a href="javascript:;">Ask a Question</a></li>
158 <li><a href="javascript:;">Video Tutorial</a></li> 159 <li><a href="javascript:;">Video Tutorial</a></li>
159 <li><a href="javascript:;">Feedback</a></li> 160 <li><a href="javascript:;">Feedback</a></li>
160 </ul> 161 </ul>
161 </div> 162 </div>
162 <!-- /span3 --> 163 <!-- /span3 -->
163 <div class="col-md-3"> 164 <div class="col-md-3">
164 <h4>Legal</h4> 165 <h4>Legal</h4>
165 <ul> 166 <ul>
166 <li><a href="javascript:;">License</a></li> 167 <li><a href="javascript:;">License</a></li>
167 <li><a href="javascript:;">Terms of Use</a></li> 168 <li><a href="javascript:;">Terms of Use</a></li>
168 <li><a href="javascript:;">Privacy Policy</a></li> 169 <li><a href="javascript:;">Privacy Policy</a></li>
169 <li><a href="javascript:;">Security</a></li> 170 <li><a href="javascript:;">Security</a></li>
170 </ul> 171 </ul>
171 </div> 172 </div>
172 <!-- /span3 --> 173 <!-- /span3 -->
173 <div class="col-md-3"> 174 <div class="col-md-3">
174 <h4>Settings</h4> 175 <h4>Settings</h4>
175 <ul> 176 <ul>
176 <li><a href="javascript:;">Consectetur adipisicing</a></li> 177 <li><a href="javascript:;">Consectetur adipisicing</a></li>
177 <li><a href="javascript:;">Eiusmod tempor </a></li> 178 <li><a href="javascript:;">Eiusmod tempor </a></li>
178 <li><a href="javascript:;">Fugiat nulla pariatur</a></li> 179 <li><a href="javascript:;">Fugiat nulla pariatur</a></li>
179 <li><a href="javascript:;">Officia deserunt</a></li> 180 <li><a href="javascript:;">Officia deserunt</a></li>
180 </ul> 181 </ul>
181 </div> 182 </div>
182 <!-- /span3 --> 183 <!-- /span3 -->
183 </div> 184 </div>
184 <!-- /row --> 185 <!-- /row -->
185 </div> 186 </div>
186 <!-- /container --> 187 <!-- /container -->
187 </div> 188 </div>
188 <!-- /extra --> 189 <!-- /extra -->
189 <div class="footer"> 190 <div class="footer">
190 <div class="container"> 191 <div class="container">
191 <div class="row"> 192 <div class="row">
192 <div id="footer-copyright" class="col-md-6"> 193 <div id="footer-copyright" class="col-md-6">
193 &copy; 2012-13 Jumpstart UI. 194 &copy; 2012-13 Jumpstart UI.
194 </div> 195 </div>
195 <!-- /span6 --> 196 <!-- /span6 -->
196 <div id="footer-terms" class="col-md-6"> 197 <div id="footer-terms" class="col-md-6">
197 Theme by <a href="http://jumpstartui.com" target="_blank">Jumpstart UI</a> 198 Theme by <a href="http://jumpstartui.com" target="_blank">Jumpstart UI</a>
198 </div> 199 </div>
199 <!-- /.span6 --> 200 <!-- /.span6 -->
200 </div> 201 </div>
201 <!-- /row --> 202 <!-- /row -->
202 </div> 203 </div>
203 <!-- /container --> 204 <!-- /container -->
204 </div> 205 </div>
205 206