From 754a525b97c657c57d081b5cff90341704fb5113 Mon Sep 17 00:00:00 2001
From: anchit <anchit.jindal@viithiisys.com>
Date: Mon, 21 May 2018 14:47:21 +0530
Subject: [PATCH] fixed schedular issues

---
 app/partials/scheduler/scheduler.controller.js | 31 ++++++--------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/app/partials/scheduler/scheduler.controller.js b/app/partials/scheduler/scheduler.controller.js
index 82b814d..ec9b970 100644
--- a/app/partials/scheduler/scheduler.controller.js
+++ b/app/partials/scheduler/scheduler.controller.js
@@ -12,39 +12,18 @@ angular.module('acufuel')
   $scope.events = [];
   function getEventsList(){
     schedulerService.getEvents().then(function(result) {
-      //console.log('----kd events-------',result);
-      //console.log("==length===",result.length);
       
       for (var i = 0; i < result.length; i++) {
-        var newTime = new Date(result[i].deployDate);
-       // console.log("deployDate",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 +',\n' + result[i].make +'/' + result[i].model +',\n' + result[i].requestedVolume +',' +result[i].priceQuote,
-          'start': dyear+'-'+dmonth+'-'+dday
-            
-        })*/
         $scope.events.push({
           'id': result[i].id,
           'title': result[i].aircraft +'\n' + '(' + result[i].make +'/' + result[i].model + ')' + '\n' + 'for' + ' ' + result[i].requestedVolume + ' ' + 'gal.' + ' ' +'@' + ' ' +'$'+result[i].priceQuote,
-          'start': dyear+'-'+dmonth+'-'+dday
+          'start': result[i].deployDate
             
         })
-      //  $scope.showEventsList();
          $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;
    })
 }
 
@@ -131,7 +110,11 @@ $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);
+      var setDeploy = new Date();
+      var hours = setDeploy.getHours();
+      var min = setDeploy.getMinutes();
+      var sec = setDeploy.getSeconds();
+      
       for (var i = 0; i < $scope.events.length; i++) {
         if ($scope.events[i].id == event.id) {
 
@@ -141,7 +124,7 @@ $scope.alertOnDrop = function(event, delta, revertFunc, jsEvent, ui, view){
           $scope.updatedDataDrop = {};
           $scope.updatedDataDrop.id = $scope.events[i].id;
           $scope.updatedDataDrop.aircraft = $scope.events[i].title;
-          $scope.updatedDataDrop.deployDate = dyear+'-'+dmonth+'-'+dday;
+          $scope.updatedDataDrop.deployDate = dyear+'-'+dmonth+'-'+dday + ' ' + hours + ':' + min + ':' + sec;
           if ($scope.updatedDataDrop.deployDate != undefined) {
             $scope.updatedDataDrop.deployDate = new Date($scope.updatedDataDrop.deployDate);
             $scope.updatedDataDrop.deployDate = $scope.updatedDataDrop.deployDate.getTime();
-- 
2.0.0