Styling, fewer columns in small/medium screen, logo resize

This commit is contained in:
Steve Pettitt
2016-02-20 17:20:43 +00:00
parent 83d248469f
commit 23e774bede
7 changed files with 55 additions and 49 deletions

View File

@@ -1,8 +1,8 @@
Darkswarm.controller "OrdersCtrl", ($scope, $rootScope, $timeout, Orders, Search, $document, HashNavigation, FilterSelectorsService, EnterpriseModal, enterpriseMatchesNameQueryFilter, distanceWithinKmFilter) ->
$scope.Orders = Orders
$scope.filterEnterprises = ->
es = Enterprises.hubs
$scope.nameMatches = enterpriseMatchesNameQueryFilter(es, true)
$scope.distanceMatches = enterpriseMatchesNameQueryFilter(es, false)
$scope.distanceMatches = distanceWithinKmFilter($scope.distanceMatches, 50)
# $scope.filterEnterprises = ->
# es = Enterprises.hubs
# $scope.nameMatches = enterpriseMatchesNameQueryFilter(es, true)
# $scope.distanceMatches = enterpriseMatchesNameQueryFilter(es, false)
# $scope.distanceMatches = distanceWithinKmFilter($scope.distanceMatches, 50)

View File

@@ -6,9 +6,11 @@ Darkswarm.factory 'Orders', (orders_by_distributor, currencyConfig, CurrentHub,
@currency_symbol = currencyConfig.symbol
for distributor in @orders_by_distributor
console.log distributor
for order, i in distributor.distributed_orders
balances = distributor.distributed_orders.slice(i,distributor.distributed_orders.length).map (o) -> parseFloat(o.outstanding_balance)
running_balance = balances.reduce (a,b) -> a+b
order.running_balance = running_balance.toFixed(2)
console.log order
@updateRunningBalance(distributor.distributed_orders)
updateRunningBalance: (orders) ->
for order, i in orders
balances = orders.slice(i,orders.length).map (o) -> parseFloat(o.outstanding_balance)
running_balance = balances.reduce (a,b) -> a+b
order.running_balance = running_balance.toFixed(2)