From c622f8e758197586b022722661191b23e0cd343a Mon Sep 17 00:00:00 2001
From: swarn <swarn.singh@viithiisys.com>
Date: Fri, 16 Jun 2017 18:27:59 +0530
Subject: [PATCH] drog-drop and update scheduler fixed, ui issue on update ramp
 fee manager fixed

---
 app/partials/scheduler/scheduler.controller.js     |  25 +++-
 .../updateFuelManager/updateFuelManager.html       | 146 ++++++++++-----------
 2 files changed, 94 insertions(+), 77 deletions(-)

diff --git a/app/partials/scheduler/scheduler.controller.js b/app/partials/scheduler/scheduler.controller.js
index c6dfd1a..89f5d1d 100644
--- a/app/partials/scheduler/scheduler.controller.js
+++ b/app/partials/scheduler/scheduler.controller.js
@@ -40,6 +40,7 @@ angular.module('acufuel')
     schedulerService.addNewEventService($scope.newEvent).then(function(response){
       $scope.newEvent = {};
       $('#addEvent').modal('hide');
+      $scope.events = [];
       getEventsList();
     })
   }
@@ -70,6 +71,7 @@ angular.module('acufuel')
       toastr.success('Updated Successfully', {
         closeButton: true
       })
+      $scope.events = [];
       getEventsList();
     })
   }
@@ -111,8 +113,29 @@ $scope.alertOnDrop = function(event, delta, revertFunc, jsEvent, ui, view){
       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.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);
diff --git a/app/partials/updateFuelManager/updateFuelManager.html b/app/partials/updateFuelManager/updateFuelManager.html
index 362bf16..429a664 100644
--- a/app/partials/updateFuelManager/updateFuelManager.html
+++ b/app/partials/updateFuelManager/updateFuelManager.html
@@ -11,10 +11,9 @@
 <div class="myLoader" ng-show="showLoader">
   <img src="../img/hourglass.gif" width="50px;">
 </div>
-<div style="width: 90%; margin-left: 5%;">
-   <div class="row">
+
+<div class="col-xs-12 col-md-6">
    
-   <div class="col-md-6">
          <div class="widget stacked">
             <div class="widget-header">
                <i class="fa fa-pencil"></i>
@@ -79,9 +78,68 @@
             <!-- /widget-content -->
          </div>
          <!-- /widget -->  
-   </div>
 
-      <div class="col-md-6">
+
+
+         <div class="widget stacked">
+            <div class="widget-header">
+               <i class="fa fa-pencil"></i>
+               <h3>Price Manager</h3>
+               <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()">
+                  <option value="" disabled selected="selected">Email All Pricing</option>
+                  <option value="JET-A">Email JET-A pricing only</option>
+                  <option value="AVGAS">Email AVGAS pricing only</option>
+                  <option disabled>_______________________________</option>
+                  <option value="all">Distribute All</option>
+               </select>
+            </div>
+            <!-- /widget-header -->
+            <div class="widget-content">
+               <h4>Deployed Fuel Prices</h4>
+               <table class="table">
+                  <thead>
+                     <tr>
+                        <th> Product</th>
+                        <th> Cost</th>
+                        <th> Margin</th>
+                        <th> PAP(Total)</th>
+                        <th style="color: #F90;"> Expires</th>
+                     </tr>
+                  </thead>
+                  <tbody>
+                     <tr ng-repeat="fuelPricing in newFuelPricing | filter:{ status: true }">
+                        <td>
+                           <span style="color: #2196f3" ng-show="fuelPricing.jeta">{{fuelPricing.name}}</span>
+                           <span  ng-show="fuelPricing.jeta">{{fuelPricing.namejetrest}}</span>
+                           <span style="color: 39c" ng-show="fuelPricing.avgas">{{fuelPricing.name}}</span>
+                           <span  ng-show="fuelPricing.avgas">{{fuelPricing.nameavgasrest}}</span>
+                        </td>
+                        <td>
+                          <span>{{fuelPricing.fuelPricing.cost}}</span>
+                          </td>
+                        <td>
+                          <span>{{fuelPricing.fuelPricing.papMargin}}</span>
+                           </td>
+                        <td>
+                           <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.fuelPricing.cost -- fuelPricing.fuelPricing.papMargin  | number : 2 }}</span>
+                        </td>
+                        <td>
+                          <span>{{fuelPricing.fuelPricing.expirationDate}}</span>
+                        </td>
+                     </tr>
+                  </tbody>
+               </table>
+              
+            </div>
+            <!-- /widget-content -->
+         </div>
+         <!-- /widget -->  
+      
+   
+</div>
+<div class="col-xs-12 col-md-6">
+   
+
          <div class="widget stacked">
             <div class="widget-header">
                <i class="fa fa-pencil"></i>
@@ -184,71 +242,9 @@
             <!-- /widget-content -->
          </div>
          <!-- /widget -->
-      </div>
-      <!-- /span6 -->
-   </div>
-   <!-- /span12 -->
-</div>
-<!-- /row -->
-<div style="width: 96%; margin-left: 2%;">
-<div class="row">
-     <div class="col-md-6">
-         <div class="widget stacked">
-            <div class="widget-header">
-               <i class="fa fa-pencil"></i>
-               <h3>Price Manager</h3>
-               <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()">
-                  <option value="" disabled selected="selected">Email All Pricing</option>
-                  <option value="JET-A">Email JET-A pricing only</option>
-                  <option value="AVGAS">Email AVGAS pricing only</option>
-                  <option disabled>_______________________________</option>
-                  <option value="all">Distribute All</option>
-               </select>
-            </div>
-            <!-- /widget-header -->
-            <div class="widget-content">
-               <h4>Deployed Fuel Prices</h4>
-               <table class="table">
-                  <thead>
-                     <tr>
-                        <th> Product</th>
-                        <th> Cost</th>
-                        <th> Margin</th>
-                        <th> PAP(Total)</th>
-                        <th style="color: #F90;"> Expires</th>
-                     </tr>
-                  </thead>
-                  <tbody>
-                     <tr ng-repeat="fuelPricing in newFuelPricing | filter:{ status: true }">
-                        <td>
-                           <span style="color: #2196f3" ng-show="fuelPricing.jeta">{{fuelPricing.name}}</span>
-                           <span  ng-show="fuelPricing.jeta">{{fuelPricing.namejetrest}}</span>
-                           <span style="color: 39c" ng-show="fuelPricing.avgas">{{fuelPricing.name}}</span>
-                           <span  ng-show="fuelPricing.avgas">{{fuelPricing.nameavgasrest}}</span>
-                        </td>
-                        <td>
-                          <span>{{fuelPricing.fuelPricing.cost}}</span>
-                          </td>
-                        <td>
-                          <span>{{fuelPricing.fuelPricing.papMargin}}</span>
-                           </td>
-                        <td>
-                           <span style="line-height: 31px; color: #1ab394;">$ {{fuelPricing.fuelPricing.cost -- fuelPricing.fuelPricing.papMargin  | number : 2 }}</span>
-                        </td>
-                        <td>
-                          <span>{{fuelPricing.fuelPricing.expirationDate}}</span>
-                        </td>
-                     </tr>
-                  </tbody>
-               </table>
-              
-            </div>
-            <!-- /widget-content -->
-         </div>
-         <!-- /widget -->  
-      </div>
-    
-   <div class="col-md-6">
+
+
+         
          <div class="widget stacked">
             <div class="widget-header">
                <i class="fa fa-pencil"></i>
@@ -351,13 +347,11 @@
             <!-- /widget-content -->
          </div>
          <!-- /widget -->
-   </div>
-      <!-- /span6 -->
-</div>
-</div>
-</div>
-</div> <!-- /container -->
+   
+      
 
+</div>
+<div class="clearfix"></div>
 
 <div class="addNewMargin" style="display: none;">
    <div class="customBackdrop">
-- 
2.0.0