From e95d89b77f5b51cf5ec5ec8c74bfc65bd6c5fdbb Mon Sep 17 00:00:00 2001 From: swarn Date: Mon, 12 Jun 2017 19:04:49 +0530 Subject: [PATCH] integrate editor on update fuel manager page, fix enter fuel order page --- app/index.html | 17 ++- app/js/app.js | 2 +- .../enterFuelOrder/enterFuelOrder.controller.js | 10 +- app/partials/scheduler/scheduler.controller.js | 7 +- app/partials/scheduler/scheduler.html | 122 +++++++++++---------- .../updateFuelManager.controller.js | 27 +++++ .../updateFuelManager/updateFuelManager.html | 13 ++- bower.json | 4 +- 8 files changed, 126 insertions(+), 76 deletions(-) diff --git a/app/index.html b/app/index.html index 21bfa6e..a1e83c5 100644 --- a/app/index.html +++ b/app/index.html @@ -44,11 +44,18 @@ - - + + + + @@ -86,7 +93,7 @@ - + @@ -112,7 +119,7 @@ - + @@ -190,7 +197,7 @@ - + \ No newline at end of file diff --git a/app/js/app.js b/app/js/app.js index 684208e..e356dab 100644 --- a/app/js/app.js +++ b/app/js/app.js @@ -1,7 +1,7 @@ 'use strict'; - angular.module('acufuel', ['ngCookies', 'ngResource', 'ui.router', 'ngAnimate', 'ui.bootstrap', 'xeditable', 'ui.toggle', 'ngTable', 'ui.select2']) + angular.module('acufuel', ['ngCookies', 'ngResource', 'ui.router', 'ngAnimate', 'ui.bootstrap', 'xeditable', 'ui.toggle', 'ngTable', 'ui.select2', 'ckeditor']) .config(['$httpProvider', function($httpProvider) { $httpProvider.defaults.withCredentials = true; diff --git a/app/partials/enterFuelOrder/enterFuelOrder.controller.js b/app/partials/enterFuelOrder/enterFuelOrder.controller.js index ce6ebce..629a07a 100644 --- a/app/partials/enterFuelOrder/enterFuelOrder.controller.js +++ b/app/partials/enterFuelOrder/enterFuelOrder.controller.js @@ -16,7 +16,7 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http, $scope.order = {}; $scope.dispatchOrder = {}; - $scope.dispatchOrder.fuelOrderObj = []; + $scope.dispatchOrder.fuelOrderList = []; $scope.order.upliftDate = ''; $scope.order.departingDate = ''; $scope.selectedCompanyName = ''; @@ -54,6 +54,7 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http, } $scope.dispatchFuel = function(){ + $scope.showLoader = true; $scope.order.companyId = $scope.selectedCompanyId; if ($scope.order.upliftDate != '') { $scope.order.upliftDate = new Date($scope.order.upliftDate); @@ -63,10 +64,15 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http, $scope.order.departingDate = new Date($scope.order.departingDate); $scope.order.departingDate = $scope.order.departingDate.getTime(); } - $scope.dispatchOrder.fuelOrderObj.push($scope.order); + $scope.dispatchOrder.fuelOrderList.push($scope.order); console.log('$scope.order', $scope.dispatchOrder); enterFuelOrderService.dispathFuelOrder($scope.dispatchOrder).then(function(result) { console.log('result', result); + $scope.showLoader = false; + $scope.order = {}; + toastr.success('Fuel Order Dispatched Successfully', { + closeButton: true + }) }) } diff --git a/app/partials/scheduler/scheduler.controller.js b/app/partials/scheduler/scheduler.controller.js index 8fd47a4..9445bf9 100644 --- a/app/partials/scheduler/scheduler.controller.js +++ b/app/partials/scheduler/scheduler.controller.js @@ -6,10 +6,9 @@ angular.module('acufuel') .controller('schedulerController', ['$scope', function($scope) { $scope.test = "Testing..."; - - $(document).ready(function() { + - $('#calendar').fullCalendar({ + /*$('#calendar').fullCalendar({ header: { left: 'prev,next today', center: 'title', @@ -76,7 +75,7 @@ angular.module('acufuel') ] }); - }); + });*/ }]); diff --git a/app/partials/scheduler/scheduler.html b/app/partials/scheduler/scheduler.html index 94a4327..870c798 100644 --- a/app/partials/scheduler/scheduler.html +++ b/app/partials/scheduler/scheduler.html @@ -18,72 +18,76 @@ color: #fff; background-color: #ff9900; } + + + /*#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; + }*/
-
-
-
- -

Entry Support Service

-
- -
-
-
Drag a event and drop into callender
-
    -
  • -
    My Event 1
    -
    • -
  • -
    My Event 2
    -
    • -
  • -
    My Event 3
    -
    • -
  • -
    My Event 4
    -
    • -
  • -
    My Event 5
    -
    • -
  • -
    My Event 6
    -
    • -
-
- -
- -
- -
- +
+ -
- -
+
--> -
-
- -
- +
-
diff --git a/app/partials/updateFuelManager/updateFuelManager.controller.js b/app/partials/updateFuelManager/updateFuelManager.controller.js index 83cd9f2..7991134 100644 --- a/app/partials/updateFuelManager/updateFuelManager.controller.js +++ b/app/partials/updateFuelManager/updateFuelManager.controller.js @@ -17,6 +17,17 @@ }) } + $scope.options = { + language: 'en', + allowedContent: true, + entities: false + }; + + // Called when the editor is completely ready. + $scope.onReady = function () { + // ... + }; + $scope.userProfileId = JSON.parse(localStorage.getItem('userProfileId')); updateFuelManagerService.getATypeJets($scope.userProfileId).then(function(result) { @@ -241,6 +252,22 @@ } + $scope.closeAccordian = function(jets){ + $('.'+jets.id).slideUp(); + $('#'+jets.id).removeClass('customActive'); + $('#'+jets.id+' select, #'+jets.id+' input').prop("disabled", true); + $('#'+jets.id+' .btn-success, #'+jets.id+' .btn-danger').css('display', 'none'); + $('#'+jets.id+' .btn-default').css('display', 'inline-block'); + } + + $scope.closeAccordianVtype = function(jets){ + $('.'+jets.id).slideUp(); + $('#'+jets.id).removeClass('customActive'); + $('#'+jets.id+' select, #'+jets.id+' input').prop("disabled", true); + $('#'+jets.id+' .btn-success, #'+jets.id+' .btn-danger').css('display', 'none'); + $('#'+jets.id+' .btn-default').css('display', 'inline-block'); + } + $scope.saveVtypeJetAccordian = function(jets){ $scope.showLoader = true; $scope.jetsDetail = jets; diff --git a/app/partials/updateFuelManager/updateFuelManager.html b/app/partials/updateFuelManager/updateFuelManager.html index d921550..3027d1a 100644 --- a/app/partials/updateFuelManager/updateFuelManager.html +++ b/app/partials/updateFuelManager/updateFuelManager.html @@ -92,6 +92,7 @@ $
+ @@ -147,7 +148,9 @@
-->
- + +
+
@@ -248,6 +251,7 @@ $
+ @@ -303,7 +307,8 @@
-->
- +
+
@@ -357,7 +362,7 @@
- +
@@ -397,7 +402,7 @@
- +
diff --git a/bower.json b/bower.json index 1e3b175..8186726 100644 --- a/bower.json +++ b/bower.json @@ -34,6 +34,8 @@ "angular-resource": "~1.6.4", "angular-xeditable": "~0.7.1", "angular-bootstrap-toggle": "~0.1.2", - "angular-ui-select2": "^0.0.5" + "angular-ui-select2": "^0.0.5", + "angular-ckeditor": "^1.0.3", + "angular-ui-calendar": "^1.0.2" } } -- 2.0.0