From d1e8d9afb3a474f71a230a037c8a2801a744e5a6 Mon Sep 17 00:00:00 2001 From: "kuldeep.arora" Date: Wed, 3 Oct 2018 11:35:16 +0530 Subject: [PATCH] fuel order & home screen --- app/css/custom.css | 8 +++----- app/partials/analytics/analytics.controller.js | 4 ++-- app/partials/customers/customers.controller.js | 4 ++-- app/partials/customers/customers.html | 2 +- app/partials/dashboard/dashboard.controller.js | 6 +++++- app/partials/dashboard/dashboard.html | 11 ++++++----- app/partials/enterFuelOrder/enterFuelOrder.controller.js | 12 ++++++++---- app/partials/enterFuelOrder/enterFuelOrder.html | 14 +++++++------- app/partials/fuelOrders/fuelOrders.controller.js | 13 ++++++------- app/partials/fuelOrders/fuelOrders.html | 14 +++++++------- 10 files changed, 47 insertions(+), 41 deletions(-) diff --git a/app/css/custom.css b/app/css/custom.css index a15a506..89c2b63 100644 --- a/app/css/custom.css +++ b/app/css/custom.css @@ -300,10 +300,6 @@ font-size: 10px !important; margin-top: 20px; } - - - - .new-widget-content{ padding: 0 0 0 0 !important; } @@ -759,7 +755,9 @@ font-size: 10px !important; text-align: center !important; outline: none !important; } - +.nvd3-svg{ + text-transform: capitalize; + } /*--Highlight today date--*/ .ui-datepicker-today { diff --git a/app/partials/analytics/analytics.controller.js b/app/partials/analytics/analytics.controller.js index 15fb7f8..00c11a2 100644 --- a/app/partials/analytics/analytics.controller.js +++ b/app/partials/analytics/analytics.controller.js @@ -356,7 +356,8 @@ angular.module('acufuel') //staggerLabels: true, duration: 500, stacked: false, - color: ["#FEDFC3", "#990000", "#000099", "#009900"], + /*color: ["#FEDFC3", "#990000", "#000099", "#009900"],*/ + color: ["#A9A9A9", "#000099", "#990000", "#009900"], xAxis: { axisLabel: 'Months', showMaxMin: false, @@ -634,7 +635,6 @@ angular.module('acufuel') $scope.td = $scope.td1.join("-"); analyticsService.getDRFHfpChart($scope.fd, $scope.td).then(function(result) { - console.log("===DRF HPF====",result) $scope.hfpValues = result; $scope.optionshfp = { chart: { diff --git a/app/partials/customers/customers.controller.js b/app/partials/customers/customers.controller.js index 7f7dca2..3691074 100644 --- a/app/partials/customers/customers.controller.js +++ b/app/partials/customers/customers.controller.js @@ -51,8 +51,6 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta ); - getAllCompanies(); - /*function getAllCompanies(){ CustomersService.getAllCompanies().then(function(result) { $scope.companyList = result; @@ -108,6 +106,8 @@ function customersController($scope, $rootScope, $uibModal, $filter, $http, $sta }) } + getAllCompanies(); + $scope.editMargin = function(customer) { //console.log('customer', customer); $scope.showLoader = true; diff --git a/app/partials/customers/customers.html b/app/partials/customers/customers.html index b846326..cf96aa8 100644 --- a/app/partials/customers/customers.html +++ b/app/partials/customers/customers.html @@ -123,7 +123,7 @@ - + diff --git a/app/partials/dashboard/dashboard.controller.js b/app/partials/dashboard/dashboard.controller.js index 2cef3ad..f74896b 100644 --- a/app/partials/dashboard/dashboard.controller.js +++ b/app/partials/dashboard/dashboard.controller.js @@ -213,6 +213,8 @@ $scope.saveAndCloseConfirm = function(){ $('#confirm1').css('display', 'none'); updateFuelManagerService.sendMailToGroupMargin($scope.sendEmail.pricing).then(function(result) { + // console.log("--email---",$scope.sendEmail.pricing); + // console.lo("==result==",result) $scope.sendEmail = {}; if(result.error) { toastr.error('' + result.error + '', { @@ -233,6 +235,7 @@ $scope.pendingMessageRecord=[]; dashboardService.getPendingMessage().then(function(result) { + // console.log("==message===",result) $scope.pendingMessageRecord=result; }) @@ -267,7 +270,8 @@ //staggerLabels: true, duration: 500, stacked: false, - color: ["#FEDFC3", "#990000", "#000099", "#009900"], + //color: ["#FEDFC3", "#990000", "#000099", "#009900"], + color: ["#A9A9A9", "#000099", "#990000", "#009900"], xAxis: { axisLabel: 'Months', showMaxMin: false, diff --git a/app/partials/dashboard/dashboard.html b/app/partials/dashboard/dashboard.html index 2a3b24a..29fe1f9 100644 --- a/app/partials/dashboard/dashboard.html +++ b/app/partials/dashboard/dashboard.html @@ -1,7 +1,8 @@ -
diff --git a/app/partials/enterFuelOrder/enterFuelOrder.controller.js b/app/partials/enterFuelOrder/enterFuelOrder.controller.js index 0c3e310..d3f900f 100644 --- a/app/partials/enterFuelOrder/enterFuelOrder.controller.js +++ b/app/partials/enterFuelOrder/enterFuelOrder.controller.js @@ -96,15 +96,19 @@ function enterFuelOrderController($scope, $rootScope, $uibModal, $filter, $http, } } - $scope.addTotal = function(value, valueOf){ + /*$scope.addTotal = function(value, valueOf){ if(valueOf == 'v'){ - console.log("total v",value,$scope.order.invoiced) $scope.order.total = value * $scope.order.invoiced }else if(valueOf == 'i'){ - console.log("total i",value,$scope.order.volume) $scope.order.total = $scope.order.volume * value } - } + } */ + $scope.addTotal = function(value, valueOf) { + if (value != undefined && valueOf != undefined) { + value = JSON.parse(value) + $scope.order.total = value.cost * valueOf; + } + } $scope.dispatchFuel = function(){ $scope.showLoader = true; diff --git a/app/partials/enterFuelOrder/enterFuelOrder.html b/app/partials/enterFuelOrder/enterFuelOrder.html index 9bce96a..5bd3665 100644 --- a/app/partials/enterFuelOrder/enterFuelOrder.html +++ b/app/partials/enterFuelOrder/enterFuelOrder.html @@ -45,7 +45,7 @@
- @@ -77,7 +77,7 @@
- +
@@ -108,13 +108,13 @@
-
+
$
- +
@@ -229,11 +229,11 @@
diff --git a/app/partials/fuelOrders/fuelOrders.controller.js b/app/partials/fuelOrders/fuelOrders.controller.js index e0f4d56..62d45f6 100644 --- a/app/partials/fuelOrders/fuelOrders.controller.js +++ b/app/partials/fuelOrders/fuelOrders.controller.js @@ -270,13 +270,12 @@ function fuelOrdersController($scope, $rootScope, $uibModal, $filter, $http, NgT } - $scope.addTotal = function(value, valueOf){ - if(valueOf == 'v'){ - $scope.order.total = value * $scope.order.invoiced - }else if(valueOf == 'i'){ - $scope.order.total = $scope.order.volume * value - } - } + $scope.addTotal = function(value, valueOf) { + if (value != undefined && valueOf != undefined) { + value = JSON.parse(value) + $scope.order.total = value.cost * valueOf; + } + } $scope.addFuelData = function() { $scope.showLoader = true; diff --git a/app/partials/fuelOrders/fuelOrders.html b/app/partials/fuelOrders/fuelOrders.html index 8d2b36e..965145b 100644 --- a/app/partials/fuelOrders/fuelOrders.html +++ b/app/partials/fuelOrders/fuelOrders.html @@ -561,7 +561,7 @@
- @@ -593,7 +593,7 @@
- +
@@ -624,13 +624,13 @@
-
+
$
- +
@@ -746,11 +746,11 @@
-- 2.0.0