viithiisys / Acufuel

Browse Code »

Commit a49ef536103f08b085b1b43632493c70935163f9

Authored by Kuldeep Arora 2017-12-22 05:36:21 -0500

1 parent 562610b62d

Exists in master

dashboard & Scheduler live

Showing 5 changed files with 135 additions and 33 deletions Show diff stats

app/partials/dashboard/dashboard.controller.js

Diff comments View file @a49ef53

     (function() {
     'use strict'
     angular.module('acufuel')
         .controller('dashboardController', [ '$scope', '$filter', '$rootScope', '$state', 'dashboardService', dashboardController]);
     function dashboardController($scope, $filter, $rootScope, $state, dashboardService) {
         $scope.getQuote = true;
         $scope.showQuote = false;
         $scope.getQuote = function () {
     		$scope.getQuote = false;
             $scope.showQuote = true;
     	}
     	$scope.logout = function () {
     		localStorage.removeItem("loginStatus");
     		$rootScope.path = false;
     		$state.reload();
     	}
-          $scope.marginList = {}
+          $scope.marginList = {};
              dashboardService.getMargin().then(function(result) {
                 $scope.marginList = result;
                 console.log("Margin result", result)
             })
         $scope.newFuelPricing = {};
         dashboardService.getFuelPricingNew().then(function(result) {
             $scope.newFuelPricing = result;
             console.log("Fuel Pricing result", result)
               for (var i = 0; i<$scope.newFuelPricing.length; i++) {
                 if ($scope.newFuelPricing[i].fuelPricing != null) {
                     if ($scope.newFuelPricing[i].fuelPricing.expirationDate != null && $scope.newFuelPricing[i].fuelPricing.expirationDate != '') {
                         var newTime = new Date($scope.newFuelPricing[i].fuelPricing.expirationDate);
                         var month = newTime.getUTCMonth() + 1; //months from 1-12
                         var day = newTime.getUTCDate();
                         var year = newTime.getUTCFullYear();
                         $scope.newFuelPricing[i].fuelPricing.expirationDate = month+'/'+day+'/'+year;
                     }
                 }
                 if ($scope.newFuelPricing[i].futureFuelPricing != null) {
                     if ($scope.newFuelPricing[i].futureFuelPricing != null) {
                         if ($scope.newFuelPricing[i].futureFuelPricing.nextExpiration != null && $scope.newFuelPricing[i].futureFuelPricing.nextExpiration != '') {
                             var newTime = new Date($scope.newFuelPricing[i].futureFuelPricing.nextExpiration);
                             var nextMonth = newTime.getUTCMonth() + 1; //months from 1-12
                             var nextDay = newTime.getUTCDate();
                             var nextYear = newTime.getUTCFullYear();
                             $scope.newFuelPricing[i].futureFuelPricing.nextExpiration = nextMonth+'/'+nextDay+'/'+nextYear;
                         }
                     }
                     if ($scope.newFuelPricing[i].futureFuelPricing != null) {
                         if ($scope.newFuelPricing[i].futureFuelPricing.deployDate != null && $scope.newFuelPricing[i].futureFuelPricing.deployDate != '') {
                             var newTime = new Date($scope.newFuelPricing[i].futureFuelPricing.deployDate);
                             var dmonth = newTime.getUTCMonth() + 1; //months from 1-12
                             var dday = newTime.getUTCDate();
                             var dyear = newTime.getUTCFullYear();
                             $scope.newFuelPricing[i].futureFuelPricing.deployDate = dmonth+'/'+dday+'/'+dyear;
                         }
                     }
                 }
                 var str =""+ $scope.newFuelPricing[i].name
                if(str.startsWith("J")){
                   $scope.newFuelPricing[i].jeta = true;
                   var str1 = str.substring(0,5)
                   var str2 = str.substring(6, str.length)
                   $scope.newFuelPricing[i].name = str1
                   $scope.newFuelPricing[i].namejetrest = str2
               }else if(str.startsWith("100")){
                   $scope.newFuelPricing[i].avgas = true;
                   var str1 = str.substring(0,5)
                   var str2 = str.substring(6, str.length)
                   $scope.newFuelPricing[i].name = str1
                   $scope.newFuelPricing[i].nameavgasrest = str2
               }
               }
               $scope.showLoader = false;
         })
         $scope.updateFuelPricing = {};
         $scope.updateFuelPricing.fuelPricingList = [];
         $scope.updateFuelPricing.userProfileId = $scope.userProfileId;
         $scope.updateFuelPricingClick = function(){
             $scope.showLoader = true;
             for (var i = 0; i<$scope.newFuelPricing.length; i++) {
                 if ($scope.newFuelPricing[i].fuelPricing != null) {
                     $scope.newFuelPricing[i].fuelPricing.papTotal = parseFloat($scope.newFuelPricing[i].fuelPricing.cost) + parseFloat($scope.newFuelPricing[i].fuelPricing.papMargin);
                     if ($scope.newFuelPricing[i].fuelPricing.cost == null) {
                         $scope.newFuelPricing[i].fuelPricing.cost = '';
                     }
                     if ($scope.newFuelPricing[i].fuelPricing.papMargin == null) {
                         $scope.newFuelPricing[i].fuelPricing.papMargin = '';
                     }
                     if ($scope.newFuelPricing[i].fuelPricing.papTotal == null) {
                         $scope.newFuelPricing[i].fuelPricing.papTotal = '';
                     }
                     if ($scope.newFuelPricing[i].fuelPricing.expirationDate == null) {
                         $scope.newFuelPricing[i].fuelPricing.expirationDate = '';
                     }else{
                         $scope.newFuelPricing[i].fuelPricing.expirationDate = new Date($scope.newFuelPricing[i].fuelPricing.expirationDate);
                         console.log('$scope.newFuelPricing[i].fuelPricing.expirationDate', $scope.newFuelPricing[i].fuelPricing.expirationDate);
                         $scope.newFuelPricing[i].fuelPricing.expirationDate = $scope.newFuelPricing[i].fuelPricing.expirationDate.getTime();
                     }
                     $scope.newFuelPricing[i].fuelPricing.papTotal = parseFloat($scope.newFuelPricing[i].fuelPricing.cost) + parseFloat($scope.newFuelPricing[i].fuelPricing.papMargin);
                     $scope.updateFuelPricing.fuelPricingList.push({
                         'cost': $scope.newFuelPricing[i].fuelPricing.cost,
                         'papMargin': $scope.newFuelPricing[i].fuelPricing.papMargin,
                         'papTotal': $scope.newFuelPricing[i].fuelPricing.papTotal,
                         'expirationDate': $scope.newFuelPricing[i].fuelPricing.expirationDate,
                         'productId': $scope.newFuelPricing[i].id,
                         'id': $scope.newFuelPricing[i].fuelPricing.id,
                     })
                 }else{
                     /*$scope.newFuelPricing[i].fuelPricing.cost = '';
                     $scope.newFuelPricing[i].fuelPricing.papMargin = '';
                     $scope.newFuelPricing[i].fuelPricing.papTotal = '';
                     $scope.newFuelPricing[i].fuelPricing.expirationDate = '';*/
                 }
             }
             console.log('result',$scope.marginList)
             dashboardService.updateFuelPricing($scope.updateFuelPricing).then(function(result) {
                 toastr.success('Successfully Updated', {
                   closeButton: true
                 })
                 dashboardService.getFuelPricingNew().then(function(result) {
                     $scope.newFuelPricing = result;
                       for (var i = 0; i<$scope.newFuelPricing.length; i++) {
                         if ($scope.newFuelPricing[i].fuelPricing != null) {
                             if ($scope.newFuelPricing[i].fuelPricing.expirationDate != null && $scope.newFuelPricing[i].fuelPricing.expirationDate != '') {
                                 var newTime = new Date($scope.newFuelPricing[i].fuelPricing.expirationDate);
                                 var month = newTime.getUTCMonth() + 1; //months from 1-12
                                 var day = newTime.getUTCDate();
                                 var year = newTime.getUTCFullYear();
                                 $scope.newFuelPricing[i].fuelPricing.expirationDate = month+'/'+day+'/'+year;
                             }
                         }
                         if ($scope.newFuelPricing[i].futureFuelPricing != null) {
                             if ($scope.newFuelPricing[i].futureFuelPricing != null) {
                                 if ($scope.newFuelPricing[i].futureFuelPricing.nextExpiration != null && $scope.newFuelPricing[i].futureFuelPricing.nextExpiration != '') {
                                     var newTime = new Date($scope.newFuelPricing[i].futureFuelPricing.nextExpiration);
                                     var nextMonth = newTime.getUTCMonth() + 1; //months from 1-12
                                     var nextDay = newTime.getUTCDate();
                                     var nextYear = newTime.getUTCFullYear();
                                     $scope.newFuelPricing[i].futureFuelPricing.nextExpiration = nextMonth+'/'+nextDay+'/'+nextYear;
                                 }
                             }
                             if ($scope.newFuelPricing[i].futureFuelPricing != null) {
                                 if ($scope.newFuelPricing[i].futureFuelPricing.deployDate != null && $scope.newFuelPricing[i].futureFuelPricing.deployDate != '') {
                                     var newTime = new Date($scope.newFuelPricing[i].futureFuelPricing.deployDate);
                                     var dmonth = newTime.getUTCMonth() + 1; //months from 1-12
                                     var dday = newTime.getUTCDate();
                                     var dyear = newTime.getUTCFullYear();
                                     $scope.newFuelPricing[i].futureFuelPricing.deployDate = dmonth+'/'+dday+'/'+dyear;
                                 }
                             }
                         }
                       }
                       $scope.showLoader = false;
                 })
             })
         }
 //        $scope.submitLogin = function() {
 //        	LoginService.setAuth(true);
 //        	toastr.info("Login successfully");
 //        	$state.go('app.dashboard');
 //        	/*LoginService.login($scope.username, $scope.password).then(function(result){
 //        		if(typeof result == 'object') {
 //        			LoginService.setAuth(true);
 //        			$rootScope.path = true;
 //        			var reqPwdChng = localStorage.getItem("requiredChangePwd");
 //        			if (reqPwdChng && reqPwdChng == "Y") {
 //        				$state.go('resetPassword');
 //        			} else {
 //        				$state.go('app.upload');
 //        			}
 //        		} else {
 //        			toastr.info("Error in login. Please check login name and password");
 //        		}
 //        	})*/
 //        }
+        $scope.completeOrderCount = '';
+        $scope.pendingOrderCount= '';
+         dashboardService.getFuelordercount().then(function(result) {
+             if(result[0].label=='Completed' && result[1].label=='Pending'){
+                $scope.completeOrderCount=result[0].value;
+                $scope.pendingOrderCount=result[1].value;
+             }
+            console.log("=========Order counts========", result[0].label);
+            console.log("=========Order counts========", result[0].value);
+            console.log("=========Order counts========", result[1].label);
+            console.log("=========Order counts========", result[1].value);
+        })
+        $scope.pendingMessageRecord=[];
+         dashboardService.getPendingMessage().then(function(result) {
+             $scope.pendingMessageRecord=result;
+            console.log('=======message====',result);
+         })
     }
 })();

app/partials/dashboard/dashboard.html

Diff comments View file @a49ef53

1	<style>	1	<style>
2	.subnavbar .mainnav > li:first-child > a{	2	.subnavbar .mainnav > li:first-child > a{
3	color: #ff9900;	3	color: #ff9900;
4	}	4	}
5	</style>	5	</style>
6		6	<!-- <style>
		7	table, th , td {
		8	border: 1px solid grey;
		9	border-collapse: collapse;
		10	padding: 5px;
		11	}
		12	table tr:nth-child(odd) {
		13	background-color: #f1f1f1;
		14	}
		15	table tr:nth-child(even) {
		16	background-color: #ffffff;
		17	}
		18	</style> -->
7		19
8	<div class="main">	20	<div class="main">
9	<div class="container" ng-if="isAuthenticated">	21	<div class="container" ng-if="isAuthenticated">
10	<div class="row">	22	<div class="row">
11	<div class="col-md-7">	23	<div class="col-md-7">
12	<div class="widget stacked">	24	<div class="widget stacked">
13	<div class="row">	25	<div class="row">
14	<div class="col-md-3">	26	<div class="col-md-3">
15	<div class="widget-header">	27	<div class="widget-header">
16	<i class="fa fa-tint"></i>   Fuel Orders	28	<i class="fa fa-tint"></i>   Fuel Orders
17	</div>	29	</div>
18	<div class="custom-widget-content">	30	<div class="custom-widget-content">
19	<div>	31	<div>
20	<div class="col-xs-12">	32	<div class="col-xs-12">
21	<span class="pull-left">Completed</span>	33	<span class="pull-left">Completed</span>
22	<button class="btn btn-success btn-xs pull-right">	34	<button class="btn btn-success btn-xs pull-right" style="cursor: default">
23	<span style="font-size:9px;">Monthly</span>	35	<span style="font-size:9px;">Monthly</span>
24	</button>	36	</button>
25	<div class="clearfix"></div>	37	<div class="clearfix"></div>
26	</div>	38	</div>
27	<div class="clearfix"></div>	39	<div class="clearfix"></div>
28	</div>	40	</div>
29	<hr class="hr">	41	<hr class="hr">
30	<div class="col-xs-12">	42	<div class="col-xs-12">
31	<h2 style="margin-bottom: 0px;">280</h2>	43	<h2 style="margin-bottom: 0px;">{{completeOrderCount}}</h2>
32	<span>Fuel Orders</span>	44	<span>Fuel Orders</span>
33	</div>	45	</div>
34	<div class="clearfix"></div>	46	<div class="clearfix"></div>
35	</div>	47	</div>
36	</div>	48	</div>
37	<div class="col-md-3">	49	<div class="col-md-3">
38	<div class="widget-header">	50	<div class="widget-header">
39	<i class="fa fa-tint"></i>   Fuel Orders	51	<i class="fa fa-tint"></i>   Fuel Orders
40	</div>	52	</div>
41	<div class="custom-widget-content">	53	<div class="custom-widget-content">
42	<div>	54	<div>
43	<div class="col-xs-12">	55	<div class="col-xs-12">
44	<span class="pull-left">Pending</span>	56	<span class="pull-left">Pending</span>
45	<button class="btn btn-success btn-xs pull-right pull-right-color ">	57	<button class="btn btn-success btn-xs pull-right pull-right-color " style="cursor: default">
46	<span style="font-size:9px;">Monthly</span>	58	<span style="font-size:9px;">Monthly</span>
47	</button>	59	</button>
48	<div class="clearfix"></div>	60	<div class="clearfix"></div>
49	</div>	61	</div>
50	<div class="clearfix"></div>	62	<div class="clearfix"></div>
51	</div>	63	</div>
52	<hr class="hr">	64	<hr class="hr">
53	<div class="col-xs-12">	65	<div class="col-xs-12">
54	<h2 style="margin-bottom: 0px;">280</h2>	66	<h2 style="margin-bottom: 0px;">{{pendingOrderCount}}</h2>
55	<span>Fuel Orders</span>	67	<span>Fuel Orders</span>
56	</div>	68	</div>
57	<div class="clearfix"></div>	69	<div class="clearfix"></div>
58	</div>	70	</div>
59	</div>	71	</div>
60	<div class="col-md-6">	72	<div class="col-md-6">
61	<div class="widget-header">	73	<div class="widget-header">
62	<i class="fa fa-list-alt "></i>	74	<i class="fa fa-list-alt "></i>
63	<h3>Fuel Order</h3>	75	<h3>Fuel Order</h3>
64	</div>	76	</div>
65	<div class="custom-widget-content">	77	<div class="custom-widget-content">
66	<div>	78	<div>
67	<div class="col-xs-12">	79	<div class="col-xs-12">
68	<span class="pull-left">Activity: Airport Operations</span>	80	<span class="pull-left">Activity: Airport Operations</span>
69	<button class="btn btn-primary btn-xs pull-right">	81	<button class="btn btn-primary btn-xs pull-right" style="cursor: default">
70	<span style="font-size:9px;">Monthly</span>	82	<span style="font-size:9px;">Monthly</span>
71	</button>	83	</button>
72	<div class="clearfix"></div>	84	<div class="clearfix"></div>
73	</div>	85	</div>
74	<div class="clearfix"></div>	86	<div class="clearfix"></div>
75	</div>	87	</div>
76	<hr class="hr">	88	<hr class="hr">
77	<div class="col-xs-6">	89	<div class="col-xs-6">
78	<h2 style="margin-bottom:0px;">280</h2>	90	<h2 style="margin-bottom:0px;">280</h2>
79	<span>Based-Aircraft</span>	91	<span>Based-Aircraft</span>
80	</div>	92	</div>
81	<div class="col-xs-6">	93	<div class="col-xs-6">
82	<h2 style="margin-bottom: 0px;">280</h2>	94	<h2 style="margin-bottom: 0px;">280</h2>
83	<span>Take-offs & Landings</span>	95	<span>Take-offs & Landings</span>
84	</div>	96	</div>
85	<div class="clearfix"></div>	97	<div class="clearfix"></div>
86	</div>	98	</div>
87	</div>	99	</div>
88	</div>	100	</div>
89	</br>	101	</br>
90	<div class="row">	102	<div class="row">
91	<div class="col-md-12">	103	<div class="col-md-12">
92	<div class="widget-header">	104	<div class="widget-header">
93	<i class="fa fa-signal" aria-hidden="true"></i>	105	<i class="fa fa-signal" aria-hidden="true"></i>
94	<h3>Chart</h3>	106	<h3>Chart</h3>
95	</div>	107	</div>
96	<!-- /widget-header -->	108	<!-- /widget-header -->
97	<div class="widget-content">	109	<div class="widget-content">
98	<div class="stats">	110	<div class="stats">
99	<div class="stat">	111	<div class="stat">
100	<span class="stat-value">12,386</span>	112	<span class="stat-value">12,386</span>
101	Site Visits	113	Site Visits
102	</div>	114	</div>
103	<!-- /stat -->	115	<!-- /stat -->
104	<div class="stat">	116	<div class="stat">
105	<span class="stat-value">9,249</span>	117	<span class="stat-value">9,249</span>
106	Unique Visits	118	Unique Visits
107	</div>	119	</div>
108	<!-- /stat -->	120	<!-- /stat -->
109	<div class="stat">	121	<div class="stat">
110	<span class="stat-value">70%</span>	122	<span class="stat-value">70%</span>
111	New Visits	123	New Visits
112	</div>	124	</div>
113	<!-- /stat -->	125	<!-- /stat -->
114	</div>	126	</div>
115	<!-- /stats -->	127	<!-- /stats -->
116	<div id="chart-stats" class="stats">	128	<div id="chart-stats" class="stats">
117	<div class="stat stat-chart">	129	<div class="stat stat-chart">
118	<!-- <div id="donut-chart" class="chart-holder"></div> --> <!-- #donut -->	130	<!-- <div id="donut-chart" class="chart-holder"></div> --> <!-- #donut -->
119	<div id="area-chart" class="chart-holder" style="height: 250px;"></div>	131	<div id="area-chart" class="chart-holder" style="height: 250px;"></div>
120	<!-- /area-chart -->	132	<!-- /area-chart -->
121	</div>	133	</div>
122	<!-- /substat -->	134	<!-- /substat -->
123	<div class="stat stat-time">	135	<div class="stat stat-time">
124	<span class="stat-value">00:28:13</span>	136	<span class="stat-value">00:28:13</span>
125	Average Time on Site	137	Average Time on Site
126	</div>	138	</div>
127	<!-- /substat -->	139	<!-- /substat -->
128	</div>	140	</div>
129	<!-- /substats -->	141	<!-- /substats -->
130	</div>	142	</div>
131	<!-- /widget-content -->	143	<!-- /widget-content -->
132	</div>	144	</div>
133	<!-- /widget -->	145	<!-- /widget -->
134	</div>	146	</div>
135	</div>	147	</div>
136	</div>	148	</div>
137	<!-- /span6 -->	149	<!-- /span6 -->
138	<div class="col-md-5">	150	<div class="col-md-5">
139	<div class="widget stacked">	151	<div class="widget stacked">
140	<div class="widget-header">	152	<div class="widget-header">
141	<i class="fa fa-pencil"></i>	153	<i class="fa fa-pencil"></i>
142	<h3>Price Manager</h3>	154	<h3>Price Manager</h3>
143	<select style="float: right; margin: 7px 10px; width: 150px; height: 26px; padding: 0 0;" class="btn btn-primary" class="form-control" ng-model="sendEmail.pricing" ng-change="confirmMail()">	155	<select style="float: right; margin: 7px 10px; width: 150px; height: 26px; padding: 0 0;" class="btn btn-primary" class="form-control" ng-model="sendEmail.pricing" ng-change="confirmMail()">
144	<option value="" disabled selected="selected">Email All Pricing</option>	156	<option value="" disabled selected="selected">Email All Pricing</option>
145	<option value="JET-A">Email JET-A pricing only</option>	157	<option value="JET-A">Email JET-A pricing only</option>
146	<option value="AVGAS">Email AVGAS pricing only</option>	158	<option value="AVGAS">Email AVGAS pricing only</option>
147	<option disabled>_______________________________</option>	159	<option disabled>_______________________________</option>
148	<option value="all">Distribute All</option>	160	<option value="all">Distribute All</option>
149	</select>	161	</select>
150	</div>	162	</div>
151	<!-- /widget-header -->	163	<!-- /widget-header -->
152	<div class="widget-content">	164	<div class="widget-content">
153	<h4>Deployed Fuel Prices</h4>	165	<h4>Deployed Fuel Prices</h4>
154	<table class="table">	166	<table class="table">
155	<thead>	167	<thead>
156	<tr>	168	<tr>
157	<th> Product</th>	169	<th> Product</th>
158	<th> Cost</th>	170	<th> Cost</th>
159	<th> Margin</th>	171	<th> Margin</th>
160	<th> PAP(Total)</th>	172	<th> PAP(Total)</th>
161	<th style="color: #F90;"> Expires</th>	173	<th style="color: #F90;"> Expires</th>
162	</tr>	174	</tr>
163	</thead>	175	</thead>
164	<tbody>	176	<tbody>
165	<tr ng-repeat="fuelPricing in newFuelPricing \| filter:{ status: true }">	177	<tr ng-repeat="fuelPricing in newFuelPricing \| filter:{ status: true }">
166	<td>	178	<td>
167	<span style="color: #2196f3" ng-show="fuelPricing.jeta">{{fuelPricing.name}}</span>	179	<span style="color: #2196f3" ng-show="fuelPricing.jeta">{{fuelPricing.name}}</span>
168	<span ng-show="fuelPricing.jeta">{{fuelPricing.namejetrest}}</span>	180	<span ng-show="fuelPricing.jeta">{{fuelPricing.namejetrest}}</span>
169	<span style="color: 39c" ng-show="fuelPricing.avgas">{{fuelPricing.name}}</span>	181	<span style="color: 39c" ng-show="fuelPricing.avgas">{{fuelPricing.name}}</span>
170	<span ng-show="fuelPricing.avgas">{{fuelPricing.nameavgasrest}}</span>	182	<span ng-show="fuelPricing.avgas">{{fuelPricing.nameavgasrest}}</span>
171	</td>	183	</td>
172	<td>	184	<td>
173	<span>{{fuelPricing.fuelPricing.cost}}</span>	185	<span>{{fuelPricing.fuelPricing.cost}}</span>
174	</td>	186	</td>
175	<td>	187	<td>
176	<span>{{fuelPricing.fuelPricing.papMargin}}</span>	188	<span>{{fuelPricing.fuelPricing.papMargin}}</span>
177	</td>	189	</td>
178	<td>	190	<td>
179	<span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.fuelPricing.cost -- fuelPricing.fuelPricing.papMargin \| number : 2 }}</span>	191	<span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.fuelPricing.cost -- fuelPricing.fuelPricing.papMargin \| number : 2 }}</span>
180	</td>	192	</td>
181	<td>	193	<td>
182	<span>{{fuelPricing.fuelPricing.expirationDate}}</span>	194	<span>{{fuelPricing.fuelPricing.expirationDate}}</span>
183	</td>	195	</td>
184	</tr>	196	</tr>
185	</tbody>	197	</tbody>
186	</table>	198	</table>
187		199
188	</div>	200	</div>
189	<!-- /widget-content -->	201	<!-- /widget-content -->
190	</div>	202	</div>
191	<!-- /widget -->	203	<!-- /widget -->
192	<div class="widget widget-nopad stacked">	204	<div class="widget widget-nopad stacked">
193	<div class="widget-header">	205	<div class="widget-header">
194	<i class="fa fa-comment" aria-hidden="true"></i>	206	<i class="fa fa-comment" aria-hidden="true"></i>
195	<h3>Messages</h3>	207	<h3>Messages</h3>
196	</div>	208	</div>
197	<!-- /widget-header -->	209	<!-- /widget-header -->
198	<div class="widget-content">	210	<div class="widget-content">
199	<h4 style="padding:10px">Messages</h4>	211	<h4 style="padding:10px">Messages</h4>
200	<hr class="hr">	212	<hr class="hr">
201	<ul class="news-items">	213	<table>
		214	<tr ng-repeat="msg in pendingMessageRecord">
		215
		216	<td>Fuel Order is Pending for the company {{ msg[5] }} </td>
		217	</tr>
		218	</table>
		219	<!-- <ul class="news-items">
202	<li>	220	<li>
203	<div class="news-item-detail">	221	<div class="news-item-detail">
204	<a href="javascript:;" class="news-item-title">Duis aute irure dolor in reprehenderit</a>	222	<a href="javascript:;" class="news-item-title">Duis aute irure dolor in reprehenderit</a>
205	<p class="news-item-preview">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore.</p>	223	<p class="news-item-preview">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore.</p>
206	</div>	224	</div>
207	<div class="news-item-date">	225	<div class="news-item-date">
208	<span class="news-item-day">08</span>	226	<span class="news-item-day">08</span>
209	<span class="news-item-month">Mar</span>	227	<span class="news-item-month">Mar</span>
210	</div>	228	</div>
211	</li>	229	</li>
212	<li>	230	<li>
213	<div class="news-item-detail">	231	<div class="news-item-detail">
214	<a href="javascript:;" class="news-item-title">Duis aute irure dolor in reprehenderit</a>	232	<a href="javascript:;" class="news-item-title">Duis aute irure dolor in reprehenderit</a>
215	<p class="news-item-preview">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore.</p>	233	<p class="news-item-preview">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore.</p>
216	</div>	234	</div>
217	<div class="news-item-date">	235	<div class="news-item-date">
218	<span class="news-item-day">08</span>	236	<span class="news-item-day">08</span>
219	<span class="news-item-month">Mar</span>	237	<span class="news-item-month">Mar</span>
220	</div>	238	</div>
221	</li>	239	</li>
222	</ul>	240	</ul> -->
223	</div>	241	</div>
224	<!-- /widget-content -->	242	<!-- /widget-content -->
225	</div>	243	</div>
226	<!-- /widget -->	244	<!-- /widget -->
227	</div>	245	</div>
228	<!-- /span6 -->	246	<!-- /span6 -->
229	</div>	247	</div>
230	<!-- /row -->	248	<!-- /row -->
231	</div>	249	</div>
232	<!-- /container -->	250	<!-- /container -->
233	</div>	251	</div>
234	<!-- /main -->	252	<!-- /main -->

app/partials/dashboard/dashboard.service.js

Diff comments View file @a49ef53

 (function(){
  'use strict';
     angular.module('acufuel')
       .service('dashboardService', ['$q', '$http', 'BASE_URL', dashboardService]);
       function dashboardService($q, $http, BASE_URL) {
         var temp = {};
         this.getFuelPricingNew = function() {
           var deferred = $q.defer();
           $http({
               method : 'GET',
               url : BASE_URL.url +'/user/products',
               headers : {'Content-Type': 'application/json'},
           })
           .then(function (result){
               deferred.resolve(result.data);
           },function (result){
               deferred.resolve(result.data);
           })
           return deferred.promise;
         }
          this.getMargin = function() {
           var deferred = $q.defer();
           $http({
               method : 'GET',
               url : BASE_URL.url +'/user/margins',
               headers : {'Content-Type': 'application/json'},
           })
           .then(function (result){
               deferred.resolve(result.data);
           },function (result){
               deferred.resolve(result.data);
           })
           return deferred.promise;
         }
        this.updateFuelPricing = function(data){
           var deferred = $q.defer();
           $http({
               method : 'POST',
               url : BASE_URL.url +'/fuelPricing',
               headers : {'Content-Type': 'application/json'},
               data: data
           })
           .then(function (result){
               deferred.resolve(result.data);
           },function (result){
               deferred.resolve(result.data);
           })
           return deferred.promise;
         }
-      }
+        this.getFuelordercount = function() {
+          var deferred = $q.defer();
+          $http({
+              method : 'GET',
+              url : BASE_URL.url +'/fuelOrder/dashboardstatics',
+              headers : {'Content-Type': 'application/json'},
+          })
+          .then(function (result){
+              deferred.resolve(result.data);
+          },function (result){
+              deferred.resolve(result.data);
+          })
+          return deferred.promise;
+        }
+        this.getPendingMessage = function() {
+            var deferred = $q.defer();
+            $http({
+                method : 'GET',
+                url : BASE_URL.url +'/fuelOrder/dashboardmessages',
+                headers : {'Content-Type': 'application/json'},
+            })
+            .then(function (result){
+                deferred.resolve(result.data);
+            },function (result){
+                deferred.resolve(result.data);
+            })
+            return deferred.promise;
+          }
+    }
 })();

app/partials/scheduler/scheduler.controller.js

Diff comments View file @a49ef53

 'use strict';
 angular.module('acufuel')
 .controller('schedulerController', ['$scope','$compile', 'uiCalendarConfig', 'schedulerService', function($scope, $compile, uiCalendarConfig, schedulerService) {
   $scope.showLoader = true;
-  getEventsList();
+   getEventsList();
+  /*---get events on calendar---*/
   $scope.events = [];
   function getEventsList(){
     schedulerService.getEvents().then(function(result) {
+    	//console.log('----kd events-------',result);
       for (var i = 0; i < result.length; i++) {
         var newTime = new Date(result[i].deployDate);
         var dmonth = newTime.getUTCMonth() + 1; //months from 1-12
         var dday = newTime.getUTCDate();
         var dyear = newTime.getUTCFullYear();
         $scope.events.push({
           'id': result[i].id,
-          'title': result[i].aircraft,
+          'title': result[i].aircraft +',\n' + result[i].make +'/' + result[i].model +',\n' + result[i].requestedVolume +',' +result[i].priceQuote,
           'start': dyear+'-'+dmonth+'-'+dday
         })
-        $scope.showLoader = false;
+      //  $scope.showEventsList();
-      }
+        console.log('==kd events after push===', $scope.events)
+         $scope.showLoader = false;
+     }
+      $('#my-calendar').fullCalendar('removeEvents');
+     $('#my-calendar').fullCalendar('addEventSource',$scope.events);
+    // $scope.eventSources = [$scope.events, $scope.eventSource, $scope.eventsF];
+       // console.log('==eventSource are====',$scope.eventSources);
+    // $scope.newFuelPricing[i].futureFuelPricing.deployDate = dmonth+'/'+dday+'/'+dyear;
+   })
+}
-     // $scope.newFuelPricing[i].futureFuelPricing.deployDate = dmonth+'/'+dday+'/'+dyear;
-    })
-  }
   $scope.newEvent = {};
   $scope.addNewEvent = function(){
     console.log('newEvent', $scope.newEvent);
     $scope.showLoader = true;
     if ($scope.newEvent.deployDate != undefined) {
       $scope.newEvent.deployDate = new Date($scope.newEvent.deployDate);
       $scope.newEvent.deployDate = $scope.newEvent.deployDate.getTime();
     }
     //var data = 'aircraft='+$scope.newEvent.aircraft+'&deployDate='+$scope.newEvent.deployDate;
     schedulerService.addNewEventService($scope.newEvent).then(function(response){
       $scope.newEvent = {};
       $('#addEvent').modal('hide');
       $scope.events = [];
       getEventsList();
     })
   }
   $scope.cancelAdd = function(){
     $scope.newEvent = {};
   }
   $scope.editData = {};
   $scope.editEvent = function(data){
     $scope.editData = data;
     $('#editEvent').modal('show');
   }
   $scope.updateEvent = function(){
     $scope.showLoader = true;
     $scope.updatedData = {};
     $scope.updatedData.id = $scope.editData.id;
     $scope.updatedData.aircraft = $scope.editData.title;
     $scope.updatedData.deployDate = $scope.editData.start;
     if ($scope.updatedData.deployDate != undefined) {
       $scope.updatedData.deployDate = new Date($scope.updatedData.deployDate);
       $scope.updatedData.deployDate = $scope.updatedData.deployDate.getTime();
     }
     schedulerService.updateScheduledEvent($scope.updatedData).then(function(response){
       console.log('response', response);
       $scope.updatedData = {};
       $('#editEvent').modal('hide');
       toastr.success('Updated Successfully', {
         closeButton: true
       })
       $scope.events = [];
       getEventsList();
     })
   }
   /*  code for calendar  */
   var date = new Date();
   var d = date.getDate();
   var m = date.getMonth();
   var y = date.getFullYear();
   $scope.changeTo = 'Hungarian';
   $scope.eventSource = {};
   $scope.eventsF = function (start, end, timezone, callback) {
     var s = new Date(start).getTime() / 1000;
     var e = new Date(end).getTime() / 1000;
     var m = new Date(start).getMonth();
     var events = [{title: 'Feed Me ' + m,start: s + (50000),end: s + (100000),allDay: false, className: ['customFeed']}];
     callback(events);
   };
   $scope.calEventsExt = {
    color: '#f00',
    textColor: 'yellow',
    events: []
  };
  $scope.alertOnEventClick = function( date, jsEvent, view){
   $scope.alertMessage = (date.title + ' was clicked ');
 };
 $scope.alertOnDrop = function(event, delta, revertFunc, jsEvent, ui, view){
       var dmonth = event.start._d.getUTCMonth() + 1; //months from 1-12
       var dday = event.start._d.getUTCDate();
       var dyear = event.start._d.getUTCFullYear();
       console.log('date', dyear+'-'+dmonth+'-'+dday);
       for (var i = 0; i < $scope.events.length; i++) {
         if ($scope.events[i].id == event.id) {
           console.log('events', $scope.events[i]);
           //$scope.events[i].start = dyear+'-'+dmonth+'-'+dday;
           $scope.showLoader = true;
           $scope.updatedDataDrop = {};
           $scope.updatedDataDrop.id = $scope.events[i].id;
           $scope.updatedDataDrop.aircraft = $scope.events[i].title;
           $scope.updatedDataDrop.deployDate = dyear+'-'+dmonth+'-'+dday;
           if ($scope.updatedDataDrop.deployDate != undefined) {
             $scope.updatedDataDrop.deployDate = new Date($scope.updatedDataDrop.deployDate);
             $scope.updatedDataDrop.deployDate = $scope.updatedDataDrop.deployDate.getTime();
           }
           schedulerService.updateScheduledEvent($scope.updatedDataDrop).then(function(response){
             console.log('response', response);
             $scope.updatedDataDrop = {};
             $('#editEvent').modal('hide');
             toastr.success('Updated Successfully', {
               closeButton: true
             })
             $scope.events = [];
             getEventsList();
           })
         }
       }
       console.log('$scope.events new', $scope.events);
       $scope.alertMessage = ('Event Droped to make dayDelta ' + delta);
     };
     $scope.alertOnResize = function(event, delta, revertFunc, jsEvent, ui, view ){
      $scope.alertMessage = ('Event Resized to make dayDelta ' + delta);
    };
    $scope.addRemoveEventSource = function(sources,source) {
     var canAdd = 0;
     angular.forEach(sources,function(value, key){
       if(sources[key] === source){
         sources.splice(key,1);
         canAdd = 1;
       }
     });
     if(canAdd === 0){
       sources.push(source);
     }
   };
   $scope.addEvent = function() {
     $scope.events.push({
       title: 'Open Sesame',
       start: new Date(y, m, 28),
       end: new Date(y, m, 29),
       className: ['openSesame']
     });
   };
   $scope.remove = function(index) {
     $scope.events.splice(index,1);
   };
   $scope.changeView = function(view,calendar) {
     uiCalendarConfig.calendars[calendar].fullCalendar('changeView',view);
   };
   $scope.renderCalender = function(calendar) {
     if(uiCalendarConfig.calendars[calendar]){
       uiCalendarConfig.calendars[calendar].fullCalendar('render');
     }
   };
   $scope.eventRender = function( event, element, view ) {
     element.attr({'tooltip': event.title,
      'tooltip-append-to-body': true});
     $compile(element)($scope);
   };
   $scope.uiConfig = {
     calendar:{
       height: 450,
       editable: true,
       droppable: true,
       drop: function (event, delta, revertFunc, jsEvent, ui, view) {
       },
       header:{
         right: 'month basicWeek basicDay',
         center: 'title',
         left: 'prev,next, today'
       },
       eventClick: $scope.alertOnEventClick,
       eventDrop: $scope.alertOnDrop,
       eventResize: $scope.alertOnResize,
       eventRender: $scope.eventRender
     }
   };
   $scope.addEvent = function(index) {
     //console.log('INDEX', index);
     //console.log('EVENTS', $scope.eventSources);
-    //$scope.events.push($scope.eventList[index]);
+    // $scope.events.push($scope.eventList[index]);
   }
-  $scope.eventSources = [$scope.events, $scope.eventSource, $scope.eventsF];
+  /*$scope.showEventsList = function(){
-  $scope.eventSources2 = [$scope.calEventsExt, $scope.eventsF, $scope.events];
+    console.log('testing', $scope.eventsF);
+  };*/
+   $scope.eventSources = [$scope.events, $scope.eventSource, $scope.eventsF];
+    $scope.eventSources2 = [$scope.calEventsExt, $scope.eventsF, $scope.events];

app/partials/scheduler/scheduler.html

Diff comments View file @a49ef53

 <style type="text/css">
    .newUlView {
    padding: 5px;
    margin: 3px;
    }
    .subnavbar .mainnav > li:nth-child(4) > a{
    color: #ff9900;
    }
    .fc button, .fc-button-group, .fc-time-grid .fc-event .fc-time span{
       display: block;
    }
    .fc-state-default{
       background-color: #fff;
       background-image: none;
    }
    .fc-state-active, .fc-state-down{
       box-shadow: none;
       color: #fff;
       background-color: #ff9900;
    }
    .stacked:after, .stacked:before{
       display: none;
    }
    .btn-white, .btn-white:hover{
       background-color: #fff;
       background-image: none;
    }
    .fc-day-grid-event .fc-time{
       display: none;
    }
    /*#wrap {
       width: 1100px;
       margin: 0 auto;
    }
    #external-events {
       float: left;
       width: 150px;
       padding: 0 10px;
       border: 1px solid #ccc;
       background: #eee;
       text-align: left;
    }
    #external-events h4 {
       font-size: 16px;
       margin-top: 0;
       padding-top: 1em;
    }
    #external-events .fc-event {
       margin: 10px 0;
       cursor: pointer;
    }
    #external-events p {
       margin: 1.5em 0;
       font-size: 11px;
       color: #666;
    }
    #external-events p input {
       margin: 0;
       vertical-align: middle;
    }
    #calendar {
       float: right;
       width: 900px;
    }*/
 </style>
 <div class="myLoader" ng-show="showLoader">
   <img src="../img/hourglass.gif" width="50px;">
 </div>
 <div class="main">
    <div class="container">
       <div class="row">
          <div class="col-xs-12">
-            <div class="col-xs-12 col-md-3">
+            <div class="col-xs-12 col-md-1">
-               <div class="widget stacked">
+                <!--<div class="widget stacked">
                   <div class="widget-header">
                      <i class="fa fa-plane" aria-hidden="true"></i>
                      <h3>Enter Support Service</h3>
                   </div>
                   <div class="widget-content">
                      <label ng-repeat="item in events" ng-click="editEvent(item)" style="width: 100%;">
-                        <!-- <div class="fc-event" data-drag="true" data-jqyoui-options="{revert: 'invalid'}" jqyoui-draggable="{index: {{$index}},placeholder:true,animate:true}">
+                        <div class="fc-event" data-drag="true" data-jqyoui-options="{revert: 'invalid'}" jqyoui-draggable="{index: {{$index}},placeholder:true,animate:true}">
                            {{item.title}}
-                        </div> -->
+                        </div>
                         <div class="fc-event">
                            {{item.title}}
                         </div>
                      </label>
-                     <!-- <p>
+                     <p>
                         <input type='checkbox' id='drop-remove' />
                         <label for='drop-remove'>remove after drop</label>
-                     </p> -->
+                     </p>
                   </div>
                </div>
                <div class="text-right">
                   <button class="btn btn-default btn-white" data-toggle="modal" data-target="#addEvent">Add Event</button>
-               </div>
+               </div> -->
             </div>
-            <div class="col-xs-12 col-md-9">
+            <div class="col-xs-12 col-md-10">
                <div class="widget stacked">
                   <div class="widget-header">
                      <i class="fa fa-calendar" aria-hidden="true"></i>
-                     <h3>Schedule</h3>
+                     <h3>Schedule kd</h3>
                   </div>
                   <div class="widget-content">
-                     <div ui-calendar="uiConfig.calendar" ng-model="eventSources" data-drop="true"></div>
+                     <div id="my-calendar" ui-calendar="uiConfig.calendar" ng-model="eventSources" data-drop="true"></div>
                   </div>
                </div>
             </div>
             <div style='clear:both'></div>
+			<div class="col-xs-12 col-md-1">
+			</div>
             <!-- <div ui-calendar="uiConfig.calendar" ng-model="eventSources" class="col-xs-12 col-md-9" data-drop="true" jqyoui-droppable="{multiple:true, onDrop: 'addEvent($index)'}"></div> -->
             </div>
          </div>
       </div>
       <div>
       </div>
       <!-- /row -->
    </div>
    <!-- /container -->
 </div>
 <!-- /main -->
 <div id="addEvent" class="modal fade" role="dialog" data-backdrop="static">
   <div class="modal-dialog">
     <form ng-submit="addNewEvent()">
        <div class="modal-content">
          <div class="modal-header">
            <button type="button" ng-click="cancelAdd()" class="close" data-dismiss="modal">&times;</button>
            <h4 class="modal-title">Schedule New Event</h4>
         </div>
         <div class="modal-body">
            <div class="col-md-6" style="padding-left: 0;">
             <label>Event Name:</label>
             <input type="text" ng-model="newEvent.aircraft" class="form-control">
          </div>
          <div class="col-md-6" style="padding-right: 0;">
             <label>Deploy Date:</label>
             <input type="text" datepicker ng-model="newEvent.deployDate" class="form-control">
          </div>
          <div class="clearfix"></div>
       </div>
       <div class="modal-footer">
          <input type="submit" value="Add" class="btn btn-primary">
          <button type="button" class="btn btn-default" ng-click="cancelAdd()" data-dismiss="modal">Close</button>
       </div>
     </div>
    </form>
    </div>
 </div>
 <div id="editEvent" class="modal fade" role="dialog" data-backdrop="static">
   <div class="modal-dialog">
     <form ng-submit="updateEvent()">
        <div class="modal-content">
          <div class="modal-header">
            <button type="button" ng-click="cancelAdd()" class="close" data-dismiss="modal">&times;</button>
            <h4 class="modal-title">Update Scheduled Event</h4>
         </div>
         <div class="modal-body">
            <div class="col-md-6" style="padding-left: 0;">
             <label>Event Name:</label>
             <input type="text" ng-model="editData.title" class="form-control">
          </div>
          <div class="col-md-6" style="padding-right: 0;">
             <label>Deploy Date:</label>
             <input type="text" datepicker ng-model="editData.start" class="form-control">
          </div>
          <div class="clearfix"></div>
       </div>
       <div class="modal-footer">
          <input type="submit" value="Update" class="btn btn-primary">
          <button type="button" class="btn btn-default" ng-click="cancelUpdate()" data-dismiss="modal">Close</button>
       </div>
     </div>
    </form>
    </div>
 </div>