From 1097c2ce17125431bbec6768b8c1ab6e7ee37878 Mon Sep 17 00:00:00 2001 From: swarn Date: Mon, 22 May 2017 18:52:14 +0530 Subject: [PATCH] margin module add, edit and ui done --- app/partials/fuelManager/fuelManager.service.js | 2 +- .../updateFuelManager.controller.js | 199 +++++++++------------ .../updateFuelManager/updateFuelManager.html | 174 +++++++++++------- .../updateFuelManager/updateFuelManager.service.js | 52 +++++- 4 files changed, 242 insertions(+), 185 deletions(-) diff --git a/app/partials/fuelManager/fuelManager.service.js b/app/partials/fuelManager/fuelManager.service.js index dc0e625..1ca161b 100644 --- a/app/partials/fuelManager/fuelManager.service.js +++ b/app/partials/fuelManager/fuelManager.service.js @@ -54,7 +54,7 @@ } this.updateFullList = function(data){ - console.log('service data', data); + var deferred = $q.defer(); $http({ method : 'POST', diff --git a/app/partials/updateFuelManager/updateFuelManager.controller.js b/app/partials/updateFuelManager/updateFuelManager.controller.js index d3805f1..c4223ac 100644 --- a/app/partials/updateFuelManager/updateFuelManager.controller.js +++ b/app/partials/updateFuelManager/updateFuelManager.controller.js @@ -5,8 +5,8 @@ angular.module('acufuel') - .controller('updateFuelManagerController', ['$scope','$uibModal', function($scope , $uibModal) { - console.log("$uibModal",$uibModal); + .controller('updateFuelManagerController', ['$scope','$uibModal', 'updateFuelManagerService', function($scope , $uibModal, updateFuelManagerService) { + $scope.yes = function(data){ console.log('========'); console.log('value', data); @@ -17,128 +17,93 @@ }) } - $(document).ready(function(){ - $('#customTabToggle1').click(function(){ - console.log('tab 1'); - $('#customTabsBody1').slideDown(); - $('#customTabsBody2').slideUp(); - $('#customTabsBody3').slideUp(); - $('#customTabsBody4').slideUp(); - $('#customTabs1').addClass('customActive'); - $('#customTabs2').removeClass('customActive'); - $('#customTabs3').removeClass('customActive'); - $('#customTabs4').removeClass('customActive'); - $('.customAccordianHeader > select, .customAccordianHeader > input').prop("disabled", true); - $('.customAccordianHeader.customActive > select, .customAccordianHeader.customActive > input').prop("disabled", false); - - $('#customTabs1 > .pull-right > .btn-default').css('display', 'none'); - $('#customTabs1 > .pull-right > .btn-success').css('display', 'inline-block'); - $('#customTabs1 > .pull-right > .btn-danger').css('display', 'inline-block'); - - $('#customTabs2 > .pull-right > .btn-default').css('display', 'inline-block'); - $('#customTabs2 > .pull-right > .btn-success').css('display', 'none'); - $('#customTabs2 > .pull-right > .btn-danger').css('display', 'none'); - - $('#customTabs3 > .pull-right > .btn-default').css('display', 'inline-block'); - $('#customTabs3 > .pull-right > .btn-success').css('display', 'none'); - $('#customTabs3 > .pull-right > .btn-danger').css('display', 'none'); - - $('#customTabs4 > .pull-right > .btn-default').css('display', 'inline-block'); - $('#customTabs4 > .pull-right > .btn-success').css('display', 'none'); - $('#customTabs4 > .pull-right > .btn-danger').css('display', 'none'); + $scope.userProfileId = JSON.parse(localStorage.getItem('userProfileId')); - }) - $('#customTabToggle2').click(function(){ - console.log('tab 2'); - $('#customTabsBody1').slideUp(); - $('#customTabsBody2').slideDown(); - $('#customTabsBody3').slideUp(); - $('#customTabsBody4').slideUp(); - $('#customTabs1').removeClass('customActive'); - $('#customTabs2').addClass('customActive'); - $('#customTabs3').removeClass('customActive'); - $('#customTabs4').removeClass('customActive'); - $('.customAccordianHeader > select, .customAccordianHeader > input').prop("disabled", true); - $('.customAccordianHeader.customActive > select, .customAccordianHeader.customActive > input').prop("disabled", false); - - $('#customTabs1 > .pull-right > .btn-default').css('display', 'inline-block'); - $('#customTabs1 > .pull-right > .btn-success').css('display', 'none'); - $('#customTabs1 > .pull-right > .btn-danger').css('display', 'none'); - - $('#customTabs2 > .pull-right > .btn-default').css('display', 'none'); - $('#customTabs2 > .pull-right > .btn-success').css('display', 'inline-block'); - $('#customTabs2 > .pull-right > .btn-danger').css('display', 'inline-block'); - - $('#customTabs3 > .pull-right > .btn-default').css('display', 'inline-block'); - $('#customTabs3 > .pull-right > .btn-success').css('display', 'none'); - $('#customTabs3 > .pull-right > .btn-danger').css('display', 'none'); - - $('#customTabs4 > .pull-right > .btn-default').css('display', 'inline-block'); - $('#customTabs4 > .pull-right > .btn-success').css('display', 'none'); - $('#customTabs4 > .pull-right > .btn-danger').css('display', 'none'); + updateFuelManagerService.getATypeJets($scope.userProfileId).then(function(result) { + console.log('result', result); + $scope.aTypeJets = result; + }) + + $scope.toggleJestAccordian = function(id){ + $('.'+id).slideDown(); + $('#'+id).addClass('customActive'); + $('#'+id+' select, #'+id+' input').prop("disabled", false); + $('#'+id+' .btn-success, #'+id+' .btn-danger').css('display', 'inline-block'); + $('#'+id+' .btn-default').css('display', 'none'); + } + $scope.saveJetAccordian = function(jets){ + $scope.jetsDetail = jets; + $scope.jetsDetail.userProfileId = $scope.userProfileId; + //console.log('jets', $scope.jetsDetail); + $('.'+$scope.jetsDetail.id).slideUp(); + $('#'+$scope.jetsDetail.id).removeClass('customActive'); + $('#'+$scope.jetsDetail.id+' select, #'+$scope.jetsDetail.id+' input').prop("disabled", true); + $('#'+$scope.jetsDetail.id+' .btn-success, #'+$scope.jetsDetail.id+' .btn-danger').css('display', 'none'); + $('#'+$scope.jetsDetail.id+' .btn-default').css('display', 'inline-block'); + + var editJetData = 'productType='+$scope.jetsDetail.productType+'&marginName='+$scope.jetsDetail.marginName+'&pricingStructure='+$scope.jetsDetail.pricingStructure+'&marginValue='+$scope.jetsDetail.marginValue+'&userProfileId='+$scope.jetsDetail.userProfileId+'&marginId='+$scope.jetsDetail.id; + + updateFuelManagerService.editAtypeJetMargin(editJetData).then(function(result) { + console.log('newJet', editJetData); + toastr.success('Successfully Updated', { + closeButton: true + }) + updateFuelManagerService.getATypeJets($scope.userProfileId).then(function(result) { + console.log('result', result); + $scope.aTypeJets = result; + }) }) - $('#customTabToggle3').click(function(){ - console.log('tab 3'); - $('#customTabsBody1').slideUp(); - $('#customTabsBody2').slideUp(); - $('#customTabsBody3').slideDown(); - $('#customTabsBody4').slideUp(); - $('#customTabs1').removeClass('customActive'); - $('#customTabs2').removeClass('customActive'); - $('#customTabs3').addClass('customActive'); - $('#customTabs4').removeClass('customActive'); - $('.customAccordianHeader > select, .customAccordianHeader > input').prop("disabled", true); - $('.customAccordianHeader.customActive > select, .customAccordianHeader.customActive > input').prop("disabled", false); - - $('#customTabs1 > .pull-right > .btn-default').css('display', 'inline-block'); - $('#customTabs1 > .pull-right > .btn-success').css('display', 'none'); - $('#customTabs1 > .pull-right > .btn-danger').css('display', 'none'); - - $('#customTabs2 > .pull-right > .btn-default').css('display', 'inline-block'); - $('#customTabs2 > .pull-right > .btn-success').css('display', 'none'); - $('#customTabs2 > .pull-right > .btn-danger').css('display', 'none'); - - $('#customTabs3 > .pull-right > .btn-default').css('display', 'none'); - $('#customTabs3 > .pull-right > .btn-success').css('display', 'inline-block'); - $('#customTabs3 > .pull-right > .btn-danger').css('display', 'inline-block'); - - $('#customTabs4 > .pull-right > .btn-default').css('display', 'inline-block'); - $('#customTabs4 > .pull-right > .btn-success').css('display', 'none'); - $('#customTabs4 > .pull-right > .btn-danger').css('display', 'none'); + } + + $scope.addNewMarginBtn = function(){ + $('.addNewMargin').css('display', 'block'); + } + $scope.closeMarginPopup = function(){ + $('.addNewMargin').css('display', 'none'); + } + + $scope.newJet = {}; + $scope.newJet.productType = ''; + + $scope.addNewATypeJet = function(){ + $scope.newJet.productType = 'JET-A'; + $scope.newJet.userProfileId = $scope.userProfileId; + + var jetData = 'productType='+$scope.newJet.productType+'&marginName='+$scope.newJet.marginName+'&pricingStructure='+$scope.newJet.pricingStructure+'&marginValue='+$scope.newJet.marginValue+'&userProfileId='+$scope.newJet.userProfileId; + + updateFuelManagerService.addNewAtypeJetMargin(jetData).then(function(result) { + console.log('newJet', jetData); + toastr.success('Successfully Added', { + closeButton: true + }) + $('.addNewMargin').css('display', 'none'); + updateFuelManagerService.getATypeJets($scope.userProfileId).then(function(result) { + console.log('result', result); + $scope.aTypeJets = result; + }) }) - $('#customTabToggle4').click(function(){ - console.log('tab 4'); - $('#customTabsBody1').slideUp(); - $('#customTabsBody2').slideUp(); - $('#customTabsBody3').slideUp(); - $('#customTabsBody4').slideDown(); - $('#customTabs1').removeClass('customActive'); - $('#customTabs2').removeClass('customActive'); - $('#customTabs3').removeClass('customActive'); - $('#customTabs4').addClass('customActive'); - $('.customAccordianHeader > select, .customAccordianHeader > input').prop("disabled", true); - $('.customAccordianHeader.customActive > select, .customAccordianHeader.customActive > input').prop("disabled", false); - - $('#customTabs1 > .pull-right > .btn-default').css('display', 'inline-block'); - $('#customTabs1 > .pull-right > .btn-success').css('display', 'none'); - $('#customTabs1 > .pull-right > .btn-danger').css('display', 'none'); - - $('#customTabs2 > .pull-right > .btn-default').css('display', 'inline-block'); - $('#customTabs2 > .pull-right > .btn-success').css('display', 'none'); - $('#customTabs2 > .pull-right > .btn-danger').css('display', 'none'); - - $('#customTabs3 > .pull-right > .btn-default').css('display', 'inline-block'); - $('#customTabs3 > .pull-right > .btn-success').css('display', 'none'); - $('#customTabs3 > .pull-right > .btn-danger').css('display', 'none'); - - $('#customTabs4 > .pull-right > .btn-default').css('display', 'none'); - $('#customTabs4 > .pull-right > .btn-success').css('display', 'inline-block'); - $('#customTabs4 > .pull-right > .btn-danger').css('display', 'inline-block'); + } + /* $scope.addNewATypeJet = function(){ + $scope.newJet.productType = 'JET-A'; + $scope.newJet.userProfileId = $scope.userProfileId; + + var jetData = 'productType='+$scope.newJet.productType+'&marginName='+$scope.newJet.marginName+'&pricingStructure='+$scope.newJet.pricingStructure+'&marginValue='+$scope.newJet.marginValue+'&userProfileId='+$scope.newJet.userProfileId; + + updateFuelManagerService.addNewAtypeJetMargin(jetData).then(function(result) { + console.log('newJet', jetData); + toastr.success('Successfully Added', { + closeButton: true + }) + $('.addNewMargin').css('display', 'none'); + updateFuelManagerService.getATypeJets($scope.userProfileId).then(function(result) { + console.log('result', result); + $scope.aTypeJets = result; + }) }) - }) + }*/ }]); diff --git a/app/partials/updateFuelManager/updateFuelManager.html b/app/partials/updateFuelManager/updateFuelManager.html index eede3df..edd457a 100644 --- a/app/partials/updateFuelManager/updateFuelManager.html +++ b/app/partials/updateFuelManager/updateFuelManager.html @@ -64,7 +64,7 @@

JET-A Customer Margin Template

- +
@@ -72,69 +72,72 @@
-
- Jet Aircraft - - -
- - - +
+
+ {{jets.marginName}} + + $ + +
+ + + +
+
+
+ -
-
-
- - - - - - - - - - - - - - - - - -
- 1-250 gal. - - - 1-250 gal. - - - - - - gal. -  
- -$0.0000   - ($1.7500) - - -$0.0000   - ($1.7500) - - $ - - - - -
-
-
+ -
+ -
+
@@ -574,6 +577,49 @@
+ + + + + diff --git a/app/partials/updateFuelManager/updateFuelManager.service.js b/app/partials/updateFuelManager/updateFuelManager.service.js index 97cb3d4..ca09be1 100644 --- a/app/partials/updateFuelManager/updateFuelManager.service.js +++ b/app/partials/updateFuelManager/updateFuelManager.service.js @@ -1,12 +1,58 @@ (function(){ 'use strict'; angular.module('acufuel') - .service('updateFuelManagerService', ['$q', '$http', 'BE', updateFuelManagerService]); + .service('updateFuelManagerService', ['$q', '$http', 'BASE_URL', updateFuelManagerService]); - function updateFuelManagerService($q, $http, BE) { + function updateFuelManagerService($q, $http, BASE_URL) { var temp = {}; - + this.getATypeJets = function(id) { + + var deferred = $q.defer(); + $http({ + method : 'GET', + url : BASE_URL.url +'/margin/getJetAType/'+id, + headers : {'Content-Type': 'application/json'}, + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + deferred.resolve(result.data); + }) + return deferred.promise; + } + + this.addNewAtypeJetMargin = function(data){ + var deferred = $q.defer(); + $http({ + method : 'POST', + url : BASE_URL.url +'/margin', + headers : {'Content-Type': 'application/json'}, + data: data + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + deferred.resolve(result.data); + }) + return deferred.promise; + } + + this.editAtypeJetMargin = function(data){ + var deferred = $q.defer(); + $http({ + method : 'PUT', + url : BASE_URL.url +'/margin', + headers : {'Content-Type': 'application/json'}, + data: data + }) + .then(function (result){ + deferred.resolve(result.data); + },function (result){ + deferred.resolve(result.data); + }) + return deferred.promise; + } } -- 2.0.0