Skip to content
This repository has been archived by the owner on Aug 22, 2018. It is now read-only.

Commit

Permalink
Merge pull request #938 from mbayopanda/tshikaji_service_distribution
Browse files Browse the repository at this point in the history
Fix(lint) : Chart and donation linting errors

Former-commit-id: cc298e25c7534c1199c4a72faf51359e87ce2b90 [formerly b150924]
Former-commit-id: 717ac88
  • Loading branch information
jniles committed Dec 8, 2015
2 parents 2eed3df + 5466ab5 commit 54ab472
Show file tree
Hide file tree
Showing 12 changed files with 18,435 additions and 14 deletions.
Binary file added client/src/assets/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4,365 changes: 4,365 additions & 0 deletions client/src/css/bootstrap.css

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ function ReportPatientVisitStatus ($scope, $filter, $translate, validate, connec
}

function ChartRender(type) {
/* global Chart */
// FIXME: Need optimizations

var ctxBar = document.getElementById('BarChart').getContext('2d'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ var DonationManagementController = function ($q, $translate, $location, $routePa
angular.extend(vm, models);
vm.session.depot = vm.depots.get(vm.session.depot.uuid);
vm.session.configured = true;
addDonationItem();
addDonationItem();
}

function addDonationItem () {
Expand All @@ -100,7 +100,7 @@ var DonationManagementController = function ($q, $translate, $location, $routePa
self.inventory_uuid = inventoryReference.uuid;
self.note = '';
self.isSet = true;
}
}

return this;
}
Expand Down Expand Up @@ -166,7 +166,7 @@ var DonationManagementController = function ($q, $translate, $location, $routePa
addLot(di);
});

vm.session.step = 'input_inventories';
vm.session.step = 'input_inventories';
}

function Lot () {
Expand Down Expand Up @@ -199,10 +199,11 @@ var DonationManagementController = function ($q, $translate, $location, $routePa

function validateDonationLine (don){
var cleaned = true;
don.sum = don.lots.data.reduce(function (a, b){ return a + b.quantity}, 0);
don.sum = don.lots.data.reduce(function (a, b){ return a + b.quantity; }, 0);

for (var i = don.lots.data.length - 1; i >= 0; i--) {
if(don.lots.data[i].lot_number == '' || don.lots.data[i].lot_number == null || don.lots.data[i].quantity <= 0 || don.lots.data[i].expiration_date <= vm.session.date){
var donation = don.lots.data[i];
if(donation.lot_number === '' || donation.lot_number == null || donation.quantity <= 0 || donation.expiration_date <= vm.session.date){
cleaned = false;
break;
}
Expand Down Expand Up @@ -268,7 +269,7 @@ var DonationManagementController = function ($q, $translate, $location, $routePa
currents.push(stock);
});
stocks = stocks.concat(currents);
});
});
return stocks;
}

Expand Down Expand Up @@ -314,7 +315,7 @@ var DonationManagementController = function ($q, $translate, $location, $routePa
}

function accept (){
var document_id = uuid();
var document_id = uuid();
var purchase = simulatePurchase();
var purchase_items = getPurchaseItem(purchase.uuid);
var stocks = getStocks(purchase.uuid);
Expand Down Expand Up @@ -360,16 +361,16 @@ var DonationManagementController = function ($q, $translate, $location, $routePa
.catch(function (err) {
console.log(err);
messenger.error('STOCK.ENTRY.WRITE_ERROR');

messenger.error($translate.instant('STOCK.ENTRY.WRITE_ERROR'), false);

var stock_ids = stocks.map(function (stock){return stock.tracking_number;});

connect.delete('movement', 'tracking_number', stock_ids).
then(function (){
connect.delete('movement', 'tracking_number', stock_ids)
.then(function (){
return connect.delete('donations', 'tracking_number', stock_ids);
})
then(function (){
.then(function (){
return connect.delete('stock', 'tracking_number', stock_ids);
})
.then(function (){
Expand All @@ -381,7 +382,7 @@ var DonationManagementController = function ($q, $translate, $location, $routePa

vm.addDonationItem = addDonationItem;
vm.addLot = addLot;
vm.accept = accept;
vm.accept = accept;
vm.isValidLine = isValidLine;
vm.isPassed = isPassed;
vm.isAllPassed = isAllPassed;
Expand All @@ -398,4 +399,3 @@ DonationManagementController.$inject = [
];

angular.module('bhima.controllers').controller('DonationManagementController', DonationManagementController);

914 changes: 914 additions & 0 deletions server/models/development/bhima_data.sql

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion server/models/development/bhima_data.sql.REMOVED.git-id

This file was deleted.

Loading

0 comments on commit 54ab472

Please sign in to comment.