Blame view

app/partials/analytics/analytics.controller.js 21.9 KB
feacde5ff   Rishav   setup acuefuel in...
1
  'use strict';
d20181a2e   Anchit Jindal   fixed bugs
2
3
4
5
6
  angular.module('acufuel')
      .controller('analyticsController', ['$scope', 'analyticsService', function($scope, analyticsService) {
  
          $(document).ready(function() {
              $(function() {
d20181a2e   Anchit Jindal   fixed bugs
7
                  jQuery('#map').vectorMap({
1b71872b2   Kuldeep Arora   email and code be...
8
9
                      map: 'us_lcc',
                      backgroundColor: '#ffce99',
d20181a2e   Anchit Jindal   fixed bugs
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
                      color: '#dfdfdd',
                      hoverOpacity: 0,
                      selectedColor: '#5f8b98',
                      hoverColor: '#5f8b98',
                      enableZoom: true,
                      showTooltip: true,
                      scaleColors: ['#dfdfdd'],
                      //values: sample_data
                      onRegionClick: function(event, code) {
                          var map = $('#map').vectorMap('get', 'mapObject');
                          var name = map.getRegionName(code);
                          getRegionPap(name);
                      },
                      normalizeFunction: 'polynomial'
                  });
d20181a2e   Anchit Jindal   fixed bugs
25
              });
bd3a040f8   Kuldeep Arora   Regional Pap pric...
26
          })
d20181a2e   Anchit Jindal   fixed bugs
27
28
29
          function getRegionPap(code) {
              $scope.showLoader = true;
              analyticsService.getRPP(code).then(function(result) {
cefbd3ffa   Anchit Jindal   email related issues
30
31
32
  	            $scope.rppData = result;
  	            $scope.showLoader = false;
  	            $('#popup1').css('display', 'block');
d20181a2e   Anchit Jindal   fixed bugs
33
34
35
              })
          }
          $scope.cancelStatus = function() {
bd3a040f8   Kuldeep Arora   Regional Pap pric...
36
              $('#popup1').css('display', 'none');
d20181a2e   Anchit Jindal   fixed bugs
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
          }
          $scope.ordersCost = 0;
          $scope.ordersCount = 0;
  
          $scope.orderCostAndCount = function() {
          	analyticsService.orderCostAndCount().then(function(result) {
          		$scope.ordersCost = result.cost;
                  $scope.ordersCount = result.count;
          	})
          }
  
          $scope.drf = {};
          $scope.hfp = {};
          $scope.cs = {};
          $scope.mfsValues = [];
          $scope.msfarray = [];
          $scope.getMFS = function() {
              //var makeId = makeId;
              analyticsService.getMFS().then(function(result) {
                  $scope.mfsValues = result;
                  $scope.optionsmfs = {
                      chart: {
                          type: 'multiBarChart',
                          height: 450,
                          margin: {
                              top: 45,
                              right: 20,
                              bottom: 45,
                              left: 45
                          },
                          clipEdge: true,
                          //staggerLabels: true,
                          duration: 500,
                          stacked: false,
                          color: ["#FEDFC3", "#990000", "#000099", "#009900"],
                          xAxis: {
                              axisLabel: 'Months',
                              showMaxMin: false,
                          },
                          yAxis: {
                              axisLabel: 'Orders',
                              axisLabelDistance: -20,
                              tickFormat: function(d) {
                                  return d3.format(',.1f')(d);
                              }
                          }
                      }
                  };
                  $scope.datamfs = $scope.mfsValues;
              })
          }
  
          $scope.orderCostAndCount();
          $scope.getMFS();
          $scope.csValues = [];
          $scope.getCS = function() {
              //var makeId = makeId;
              analyticsService.getCS().then(function(result) {
                  $scope.csValues = result;
                  $scope.optionscs = {
                      chart: {
                          type: 'pieChart',
                          height: 500,
                          // color: ["#FEDFC3","#D89700","#FFE8B3","FFD980","#FF7F0E","#fff2e6","#ffcc99","#ffa64d","#ff8c1a","#B37D00","#f5f5f0","#e0e0d1","#ccccb3","#adad85","#999966","#7a7a52"],
                          x: function(d) {
                              return d.key;
                          },
                          y: function(d) {
                              return d.y;
                          },
                          showLabels: false,
                          segmentShowStroke: false,
                          animationSteps: 20,
                          animationEasing: "linear",
                          animateScale: true,
                          duration: 500,
                          labelThreshold: 0.01,
                          labelSunbeamLayout: true,
                          legend: {
                              margin: {
                                  top: 5,
                                  right: 35,
                                  bottom: 5,
                                  left: 0
                              }
                          }
                      }
                  };
                  $scope.datacs = $scope.csValues;
              })
bd3a040f8   Kuldeep Arora   Regional Pap pric...
127
          }
d20181a2e   Anchit Jindal   fixed bugs
128
          $scope.getCS();
cefbd3ffa   Anchit Jindal   email related issues
129
130
131
132
133
134
135
136
137
138
139
140
141
          
         
          $scope.hfpValues = [];
          $scope.getHfpChartData = function() {
              //var makeId = makeId;
              analyticsService.gethfpChart().then(function(result) {
              	console.log('---result--',result);
                  $scope.hfpValues = result;
                  
                 // $scope.datahfp = $scope.hfpValues;
              })
          }
          $scope.getHfpChartData();
565570086   Kuldeep Arora   highcharts(MFS,CS...
142

d20181a2e   Anchit Jindal   fixed bugs
143
          /*Historic Fuel Price */
cefbd3ffa   Anchit Jindal   email related issues
144
          
d20181a2e   Anchit Jindal   fixed bugs
145
          $scope.optionshfp = {
cefbd3ffa   Anchit Jindal   email related issues
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
                  chart: {
                      type: 'cumulativeLineChart',
                      height: 450,
                      margin: {
                          top: 20,
                          right: 20,
                          bottom: 50,
                          left: 65
                      },
                      x: function(d) {
                          return d[0];
                      },
                      y: function(d) {
                          return d[1] / 100;
                      },
                      average: function(d) {
                          return d.mean / 100;
                      },
d20181a2e   Anchit Jindal   fixed bugs
164

cefbd3ffa   Anchit Jindal   email related issues
165
166
167
168
                      color: ["#FEDFC3"],
                      duration: 300,
                      useInteractiveGuideline: true,
                      clipVoronoi: false,
d20181a2e   Anchit Jindal   fixed bugs
169

cefbd3ffa   Anchit Jindal   email related issues
170
171
172
173
174
175
176
177
                      xAxis: {
                          axisLabel: 'X Axis',
                          tickFormat: function(d) {
                          	console.log('-dd-',d);
                              return d3.time.format('%m/%d/%y')(new Date(d))
                          },
                          showMaxMin: false,
                          staggerLabels: true
d20181a2e   Anchit Jindal   fixed bugs
178
                      },
d20181a2e   Anchit Jindal   fixed bugs
179

cefbd3ffa   Anchit Jindal   email related issues
180
181
182
183
184
185
186
187
188
                      yAxis: {
                          axisLabel: 'Y Axis',
                          
                          tickFormat: function(d) {
                          	console.log('-dd-1--',d)
                              return d3.format(',.1%')(d);
                          },
                          axisLabelDistance: 0
                      }
a9aef0b1c   Anchit Jindal   new changes imple...
189
                  }
cefbd3ffa   Anchit Jindal   email related issues
190
              };
d20181a2e   Anchit Jindal   fixed bugs
191
          $scope.datahfp = [{
1b71872b2   Kuldeep Arora   email and code be...
192
              key: "Long",
d20181a2e   Anchit Jindal   fixed bugs
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
              values: [
                  [1083297600000, -2.974623048543],
                  [1085976000000, -1.7740300785979],
                  [1088568000000, 4.4681318138177],
                  [1091246400000, 7.0242541001353],
                  [1093924800000, 7.5709603667586],
                  [1096516800000, 20.612245065736],
                  [1099195200000, 21.698065237316],
                  [1101790800000, 40.501189458018],
                  [1104469200000, 50.464679413194],
                  [1107147600000, 48.917421973355],
                  [1109566800000, 63.750936549160],
                  [1112245200000, 59.072499126460],
                  [1114833600000, 43.373158880492],
                  [1117512000000, 54.490918947556],
                  [1120104000000, 56.661178852079],
                  [1122782400000, 73.450103545496],
                  [1125460800000, 71.714526354907],
                  [1128052800000, 85.221664349607],
                  [1130734800000, 77.769261392481],
                  [1133326800000, 95.966528716500],
                  [1136005200000, 107.59132116397],
                  [1138683600000, 127.25740096723],
                  [1141102800000, 122.13917498830],
                  [1143781200000, 126.53657279774],
                  [1146369600000, 132.39300992970],
                  [1149048000000, 120.11238242904],
                  [1151640000000, 118.41408917750],
                  [1154318400000, 107.92918924621],
                  [1156996800000, 110.28057249569],
                  [1159588800000, 117.20485334692],
                  [1162270800000, 141.33556756948],
                  [1164862800000, 159.59452727893],
                  [1167541200000, 167.09801853304],
                  [1170219600000, 185.46849659215],
                  [1172638800000, 184.82474099990],
                  [1175313600000, 195.63155213887],
                  [1177905600000, 207.40597044171],
                  [1180584000000, 230.55966698196],
                  [1183176000000, 239.55649035292],
                  [1185854400000, 241.35915085208],
                  [1188532800000, 239.89428956243],
                  [1191124800000, 260.47781917715],
                  [1193803200000, 276.39457482225],
                  [1196398800000, 258.66530682672],
                  [1199077200000, 250.98846121893],
                  [1201755600000, 226.89902618127],
                  [1204261200000, 227.29009273807],
                  [1206936000000, 218.66476654350],
                  [1209528000000, 232.46605902918],
                  [1212206400000, 253.25667081117],
                  [1214798400000, 235.82505363925],
                  [1217476800000, 229.70112774254],
                  [1220155200000, 225.18472705952],
                  [1222747200000, 189.13661746552],
                  [1225425600000, 149.46533007301],
                  [1228021200000, 131.00340772114],
                  [1230699600000, 135.18341728866],
                  [1233378000000, 109.15296887173],
                  [1235797200000, 84.614772549760],
                  [1238472000000, 100.60810015326],
                  [1241064000000, 141.50134895610],
                  [1243742400000, 142.50405083675],
                  [1246334400000, 139.81192372672],
                  [1249012800000, 177.78205544583],
                  [1251691200000, 194.73691933074],
                  [1254283200000, 209.00838460225],
                  [1256961600000, 198.19855877420],
                  [1259557200000, 222.37102417812],
                  [1262235600000, 234.24581081250],
                  [1264914000000, 228.26087689346],
                  [1267333200000, 248.81895126250],
                  [1270008000000, 270.57301075186],
                  [1272600000000, 292.64604322550],
                  [1275278400000, 265.94088520518],
                  [1277870400000, 237.82887467569],
                  [1280548800000, 265.55973314204],
                  [1283227200000, 248.30877330928],
                  [1285819200000, 278.14870066912],
                  [1288497600000, 292.69260960288],
                  [1291093200000, 300.84263809599],
                  [1293771600000, 326.17253914628],
                  [1296450000000, 337.69335966505],
                  [1298869200000, 339.73260965121],
                  [1301544000000, 346.87865120765],
                  [1304136000000, 347.92991526628],
                  [1306814400000, 342.04627502669],
                  [1309406400000, 333.45386231233],
                  [1312084800000, 323.15034181243],
                  [1314763200000, 295.66126882331],
                  [1317355200000, 251.48014579253],
                  [1320033600000, 295.15424257905],
                  [1322629200000, 294.54766764397],
                  [1325307600000, 295.72906119051],
                  [1327986000000, 325.73351347613],
                  [1330491600000, 340.16106061186],
                  [1333166400000, 345.15514071490],
                  [1335758400000, 337.10259395679],
                  [1338436800000, 318.68216333837],
                  [1341028800000, 317.03683945246],
                  [1343707200000, 318.53549659997],
                  [1346385600000, 332.85381464104],
                  [1348977600000, 337.36534373477],
                  [1351656000000, 350.27872156161],
                  [1354251600000, 349.45128876100]
              ],
1b71872b2   Kuldeep Arora   email and code be...
299
300
              mean: 250
          }];
d121d5539   Kuldeep Arora   UI Changes
301
          //console.log("--datahfp---",$scope.datahfp);
d20181a2e   Anchit Jindal   fixed bugs
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
          /*Date Range Filter for Monthly fuel Sales*/
          $scope.submitDate = function() {
              if ($scope.drf.fromDate === undefined) {
                  $scope.fillForm = true;
              } else if ($scope.drf.fromDate != undefined && $scope.drf.toDate === undefined || $scope.drf.toDate === '') {
                  $scope.fillForm = false;
                  var today = new Date();
                  var DefaultToDate = today.getFullYear() + '-' + ("0" + (today.getMonth() + 1)).slice(-2) + '-' + ("0" + today.getDate()).slice(-2);
                  //from date format                  
                  $scope.dat1 = $scope.drf.fromDate;
                  $scope.fd1 = $scope.dat1.split("/").reverse();
                  $scope.tmp = $scope.fd1[2];
                  $scope.fd1[2] = $scope.fd1[1];
                  $scope.fd1[1] = $scope.tmp;
                  $scope.fd = $scope.fd1.join("-");
                  analyticsService.getDRFChart($scope.fd, DefaultToDate).then(function(result) {
                      $scope.datamfs = [];
                      $scope.datamfs = result;
                  })
565570086   Kuldeep Arora   highcharts(MFS,CS...
321
                  
d20181a2e   Anchit Jindal   fixed bugs
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
  	        	analyticsService.orderCostAndCountByDate($scope.fd, DefaultToDate).then(function(result) {
  	        		$scope.ordersCost = result.cost;
  	                $scope.ordersCount = result.count;
  	        	})
              } else if ($scope.drf.fromDate != undefined && $scope.drf.toDate != undefined) {
                  $scope.fillForm = false;
                  //from date format
                  $scope.dat1 = $scope.drf.fromDate;
                  $scope.fd1 = $scope.dat1.split("/").reverse();
                  $scope.tmp = $scope.fd1[2];
                  $scope.fd1[2] = $scope.fd1[1];
                  $scope.fd1[1] = $scope.tmp;
                  $scope.fd = $scope.fd1.join("-");
                  $scope.dat2 = $scope.drf.toDate;
                  $scope.td1 = $scope.dat2.split("/").reverse();
                  $scope.tmp1 = $scope.td1[2];
                  $scope.td1[2] = $scope.td1[1];
                  $scope.td1[1] = $scope.tmp1;
                  $scope.td = $scope.td1.join("-");
  
                  analyticsService.getDRFChart($scope.fd, $scope.td).then(function(result) {
                      $scope.datamfs = [];
                      $scope.datamfs = result;
                  })
565570086   Kuldeep Arora   highcharts(MFS,CS...
346
                  
d20181a2e   Anchit Jindal   fixed bugs
347
348
349
350
351
352
353
                  analyticsService.orderCostAndCountByDate($scope.fd, $scope.td).then(function(result) {
  	        		$scope.ordersCost = result.cost;
  	                $scope.ordersCount = result.count;
  	        	})
  
              } else {
                  $scope.fillForm = true;
565570086   Kuldeep Arora   highcharts(MFS,CS...
354
              }
d20181a2e   Anchit Jindal   fixed bugs
355

565570086   Kuldeep Arora   highcharts(MFS,CS...
356
          }
d20181a2e   Anchit Jindal   fixed bugs
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
          /*Date Range Filter for Historic fuel Price*/
          $scope.submitDateHfp = function() {
  
              if ($scope.hfp.fromDate === undefined) {
  
                  // console.log("==frmdate====",$scope.drf.fromDate);
                  //console.log("==toDate====",$scope.drf.toDate);
                  $scope.fillForm = true;
              } else if ($scope.hfp.fromDate != undefined && $scope.hfp.toDate === undefined || $scope.hfp.toDate === '') {
                  $scope.fillForm = false;
                  var today = new Date();
                  var DefaultToDate = today.getFullYear() + '-' + ("0" + (today.getMonth() + 1)).slice(-2) + '-' + ("0" + today.getDate()).slice(-2);
                  //from date format                  
                  $scope.dat1 = $scope.hfp.fromDate;
                  $scope.fd1 = $scope.dat1.split("/").reverse();
                  $scope.tmp = $scope.fd1[2];
                  $scope.fd1[2] = $scope.fd1[1];
                  $scope.fd1[1] = $scope.tmp;
                  $scope.fd = $scope.fd1.join("-");
                  // console.log("===fd====",$scope.fd); 
                  //console.log("----td curr---",DefaultToDate);
                  analyticsService.getDRFHfpChart($scope.fd, DefaultToDate).then(function(result) {
                      //console.log("==date received==",$scope.fd);
                      //console.log("----to date receivedcurrent---",DefaultToDate)
                      $scope.datahfp = result;
                  })
  
  
              } else if ($scope.hfp.fromDate != undefined && $scope.hfp.toDate != undefined) {
                  $scope.fillForm = false;
                  //from date format
                  $scope.dat1 = $scope.hfp.fromDate;
                  $scope.fd1 = $scope.dat1.split("/").reverse();
                  $scope.tmp = $scope.fd1[2];
                  $scope.fd1[2] = $scope.fd1[1];
                  $scope.fd1[1] = $scope.tmp;
                  $scope.fd = $scope.fd1.join("-");
                  //to date format
                  $scope.dat2 = $scope.hfp.toDate;
                  $scope.td1 = $scope.dat2.split("/").reverse();
                  $scope.tmp1 = $scope.td1[2];
                  $scope.td1[2] = $scope.td1[1];
                  $scope.td1[1] = $scope.tmp1;
                  $scope.td = $scope.td1.join("-");
  
                  analyticsService.getDRFHfpChart($scope.fd, $scope.td).then(function(result) {
                      // console.log("==date received==",$scope.fd);
                      //console.log("----to date received---",$scope.td)
                      $scope.datahfp = result;
                  })
  
              } else {
                  $scope.fillForm = true;
75d1c3d9f   Kuldeep Arora   analytics DRF UI
410
              }
d20181a2e   Anchit Jindal   fixed bugs
411

75d1c3d9f   Kuldeep Arora   analytics DRF UI
412
          }
d20181a2e   Anchit Jindal   fixed bugs
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
          /*Date Range Filter for Customer Sources*/
          $scope.submitDateCs = function() {
              if ($scope.cs.fromDate === undefined) {
  
                  $scope.fillForm = true;
              } else if ($scope.cs.fromDate != undefined && $scope.cs.toDate === undefined || $scope.cs.toDate === '') {
                  $scope.fillForm = false;
                  var today = new Date();
                  var DefaultToDate = today.getFullYear() + '-' + ("0" + (today.getMonth() + 1)).slice(-2) + '-' + ("0" + today.getDate()).slice(-2);
                  //from date format                  
                  $scope.dat1 = $scope.cs.fromDate;
                  $scope.fd1 = $scope.dat1.split("/").reverse();
                  $scope.tmp = $scope.fd1[2];
                  $scope.fd1[2] = $scope.fd1[1];
                  $scope.fd1[1] = $scope.tmp;
                  $scope.fd = $scope.fd1.join("-");
                  analyticsService.getDRFCSChart($scope.fd, DefaultToDate).then(function(result) {
                      $scope.csValues = result;
                      $scope.optionscs = {
                          chart: {
                              type: 'pieChart',
                              height: 500,
                              // color: ["#FEDFC3","#D89700","#FFE8B3","FFD980","#FF7F0E","#fff2e6","#ffcc99","#ffa64d","#ff8c1a","#B37D00","#f5f5f0","#e0e0d1","#ccccb3","#adad85","#999966","#7a7a52"],
                              x: function(d) {
                                  return d.key;
                              },
                              y: function(d) {
                                  return d.y;
                              },
                              showLabels: false,
                              segmentShowStroke: false,
                              animationSteps: 20,
                              animationEasing: "linear",
                              animateScale: true,
                              duration: 500,
                              labelThreshold: 0.01,
                              labelSunbeamLayout: true,
                              legend: {
                                  margin: {
                                      top: 5,
                                      right: 35,
                                      bottom: 5,
                                      left: 0
b944d384c   Kuldeep Arora   analytics UI
456
                                  }
d20181a2e   Anchit Jindal   fixed bugs
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
                              }
                          }
                      };
                      $scope.datacs = $scope.csValues;
                  })
  
  
              } else if ($scope.cs.fromDate != undefined && $scope.cs.toDate != undefined) {
                  $scope.fillForm = false;
                  //from date format
                  $scope.dat1 = $scope.cs.fromDate;
                  $scope.fd1 = $scope.dat1.split("/").reverse();
                  $scope.tmp = $scope.fd1[2];
                  $scope.fd1[2] = $scope.fd1[1];
                  $scope.fd1[1] = $scope.tmp;
                  $scope.fd = $scope.fd1.join("-");
                  //to date format
                  $scope.dat2 = $scope.cs.toDate;
                  $scope.td1 = $scope.dat2.split("/").reverse();
                  $scope.tmp1 = $scope.td1[2];
                  $scope.td1[2] = $scope.td1[1];
                  $scope.td1[1] = $scope.tmp1;
                  $scope.td = $scope.td1.join("-");
  
                  analyticsService.getDRFCSChart($scope.fd, $scope.td).then(function(result) {
                      $scope.csValues = result;
                      $scope.optionscs = {
                          chart: {
                              type: 'pieChart',
                              height: 500,
                              // color: ["#FEDFC3","#D89700","#FFE8B3","FFD980","#FF7F0E","#fff2e6","#ffcc99","#ffa64d","#ff8c1a","#B37D00","#f5f5f0","#e0e0d1","#ccccb3","#adad85","#999966","#7a7a52"],
                              x: function(d) {
                                  return d.key;
                              },
                              y: function(d) {
                                  return d.y;
                              },
                              showLabels: false,
                              segmentShowStroke: false,
                              animationSteps: 20,
                              animationEasing: "linear",
                              animateScale: true,
                              duration: 500,
                              labelThreshold: 0.01,
                              labelSunbeamLayout: true,
                              legend: {
                                  margin: {
                                      top: 5,
                                      right: 35,
                                      bottom: 5,
                                      left: 0
b944d384c   Kuldeep Arora   analytics UI
508
                                  }
d20181a2e   Anchit Jindal   fixed bugs
509
510
511
512
513
514
515
516
                              }
                          }
                      };
                      $scope.datacs = $scope.csValues;
                  })
  
              } else {
                  $scope.fillForm = true;
75d1c3d9f   Kuldeep Arora   analytics DRF UI
517
              }
75d1c3d9f   Kuldeep Arora   analytics DRF UI
518

d20181a2e   Anchit Jindal   fixed bugs
519
          }
75d1c3d9f   Kuldeep Arora   analytics DRF UI
520

feacde5ff   Rishav   setup acuefuel in...
521

d20181a2e   Anchit Jindal   fixed bugs
522
      }]);