Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OLMIS-7776: Fix issues with saving lots on Physical Inventory page #69

Merged
merged 1 commit into from
Oct 2, 2024
Merged

OLMIS-7776: Fix issues with saving lots on Physical Inventory page #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ New functionalities that are backwards-compatible:

Bug fixes:
* [OLMIS-7748](https://openlmis.atlassian.net/browse/OLMIS-7748): Fix filtering 'includeInactive' on the Physical Inventory page
* [OLMIS-7776](https://openlmis.atlassian.net/browse/OLMIS-7776): Fix issues with saving lots on Physical Inventory page

2.1.5 / 2023-06-26
==================
Expand Down
5 changes: 3 additions & 2 deletions src/stock-add-products-modal/add-products-modal.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@

controller.$inject = ['availableItems', 'messageService', 'modalDeferred', 'orderableGroupService',
'$scope', 'MAX_INTEGER_VALUE', 'hasPermissionToAddNewLot', 'selectedItems', 'alertService',
'moment'];
'moment', 'draft', 'physicalInventoryDraftCacheService'];

function controller(availableItems, messageService, modalDeferred, orderableGroupService,
$scope, MAX_INTEGER_VALUE, hasPermissionToAddNewLot, selectedItems, alertService,
moment) {
moment, draft, physicalInventoryDraftCacheService) {
var vm = this;

vm.$onInit = onInit;
Expand Down Expand Up @@ -317,6 +317,7 @@
selectedItems.push(item);
}
});
physicalInventoryDraftCacheService.cacheDraft(draft);
modalDeferred.resolve();
}
}
Expand Down
18 changes: 16 additions & 2 deletions src/stock-add-products-modal/add-products-modal.controller.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@
describe('AddProductsModalController', function() {

var vm, deferred, $q, $rootScope, $controller, OrderableDataBuilder, orderableGroupService,
LotDataBuilder, messageService, scope, item1, item2, lot1, lot2, selectedItems, orderable;
LotDataBuilder, messageService, scope, item1, item2, lot1, lot2, selectedItems, orderable,
physicalInventoryDraftCacheService;

beforeEach(function() {
module('stock-add-products-modal');
module('referencedata');
module('stock-physical-inventory-draft');

inject(function($injector) {
$rootScope = $injector.get('$rootScope');
Expand All @@ -30,6 +32,7 @@ describe('AddProductsModalController', function() {
orderableGroupService = $injector.get('orderableGroupService');
LotDataBuilder = $injector.get('LotDataBuilder');
messageService = $injector.get('messageService');
physicalInventoryDraftCacheService = $injector.get('physicalInventoryDraftCacheService');
});

deferred = $q.defer();
Expand Down Expand Up @@ -69,7 +72,11 @@ describe('AddProductsModalController', function() {
orderableGroupService: orderableGroupService,
$scope: scope,
hasPermissionToAddNewLot: true,
selectedItems: selectedItems
selectedItems: selectedItems,
draft: {
lineItems: []
},
physicalInventoryDraftCacheService: physicalInventoryDraftCacheService
});
vm.$onInit();
});
Expand Down Expand Up @@ -261,13 +268,18 @@ describe('AddProductsModalController', function() {
quantity: 2
};
vm.addedItems = [item1, item2];
var draft = {
lineItems: []
};

spyOn(physicalInventoryDraftCacheService, 'cacheDraft');
spyOn(deferred, 'resolve');

//when
vm.confirm();

//then
expect(physicalInventoryDraftCacheService.cacheDraft).toHaveBeenCalledWith(draft);
expect(deferred.resolve).toHaveBeenCalled();
});

Expand All @@ -281,12 +293,14 @@ describe('AddProductsModalController', function() {
};
vm.addedItems = [item1, item2];

spyOn(physicalInventoryDraftCacheService, 'cacheDraft');
spyOn(deferred, 'resolve');

//when
vm.confirm();

//then
expect(physicalInventoryDraftCacheService.cacheDraft).not.toHaveBeenCalled();
expect(deferred.resolve).not.toHaveBeenCalled();
});
});
Expand Down
9 changes: 6 additions & 3 deletions src/stock-add-products-modal/add-products-modal.service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@
* Shows modal that allows users to choose products.
*
* @param {Array} availableItems orderable + lot items that can be selected
* @param {Array} selectedItems orderable + lot items that were added already
* @param {Array} draft physical inventory draft
* @return {Promise} resolved with selected products.
*/
function show(availableItems, selectedItems) {
function show(availableItems, draft) {
return openlmisModalService.createDialog(
{
controller: 'AddProductsModalController',
Expand All @@ -56,8 +56,11 @@
availableItems: function() {
return availableItems;
},
draft: function() {
return draft;
},
selectedItems: function() {
return selectedItems;
return draft.lineItems;
},
hasPermissionToAddNewLot: function(permissionService, ADMINISTRATION_RIGHTS,
authorizationService) {
Expand Down
7 changes: 6 additions & 1 deletion src/stock-add-products-modal/add-products-modal.service.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,17 @@ describe('addProductsModalService', function() {
lot: new that.LotDataBuilder().build()
}
];

that.draft = {
lineItems: that.lineItems
};
});

describe('show', function() {

it('should call createDialog function', function() {

that.addProductsModalService.show(that.items, that.lineItems);
that.addProductsModalService.show(that.items, that.draft);

expect(that.openlmisModalService.createDialog).toHaveBeenCalled();

Expand All @@ -72,6 +76,7 @@ describe('addProductsModalService', function() {
expect(that.config.show).toBeTruthy();
expect(angular.isFunction(that.config.resolve.availableItems)).toBeTruthy();
expect(angular.isFunction(that.config.resolve.selectedItems)).toBeTruthy();
expect(angular.isFunction(that.config.resolve.draft)).toBeTruthy();
expect(angular.isFunction(that.config.resolve.hasPermissionToAddNewLot)).toBeTruthy();
});
});
Expand Down
4 changes: 3 additions & 1 deletion src/stock-physical-inventory-draft/messages_en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,7 @@
"stockPhysicalInventoryDraft.deactivateItem": "Do you want to deactivate Product with Lot Code: ${lot} for ${product}? \n This lot will also be deactivated on stock card",
"stockPhysicalInventoryDraft.unaccountedQuantity": "Unaccounted Quantity",
"stockPhysicalInventoryDraft.unaccountedQuantityError": "Unnacounted quantity must be 0",
"stockPhysicalInventoryDraft.actions": "Actions"
"stockPhysicalInventoryDraft.actions": "Actions",
"stockPhysicalInventoryDraft.saveDraft": "Warning: Saving will make all newly added lots unmodifiable, but removing physical inventory row will still be possible.",
"stockPhysicalInventoryDraft.error": "Error"
}
54 changes: 30 additions & 24 deletions src/stock-physical-inventory-draft/physical-inventory-draft.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@
notYetAddedItems.push(item);
});

addProductsModalService.show(notYetAddedItems, draft.lineItems).then(function() {
addProductsModalService.show(notYetAddedItems, draft).then(function() {
$stateParams.program = vm.program;
$stateParams.facility = vm.facility;
$stateParams.noReload = true;
Expand Down Expand Up @@ -345,8 +345,8 @@
return item;
}
}).active = false;
vm.draft = draft;
vm.saveDraft(true);

vm.cacheDraft();
$state.go($state.current.name, $stateParams, {
reload: $state.current.name
});
Expand Down Expand Up @@ -389,31 +389,37 @@
* @description
* Save physical inventory draft.
*/
vm.saveDraft = function(withNotification) {
loadingModalService.open();
return physicalInventoryFactory.saveDraft(draft).then(function() {
if (!withNotification) {
notificationService.success('stockPhysicalInventoryDraft.saved');
}
vm.saveDraft = function() {
confirmService.confirmDestroy(
'stockPhysicalInventoryDraft.saveDraft',
'stockPhysicalInventoryDraft.save'
).then(function() {
loadingModalService.open();
return saveLots(draft, function() {
return physicalInventoryFactory.saveDraft(draft).then(function() {
notificationService.success('stockPhysicalInventoryDraft.saved');

draft.$modified = undefined;
vm.cacheDraft();
draft.$modified = undefined;
vm.cacheDraft();

$stateParams.program = vm.program;
$stateParams.facility = vm.facility;
draft.lineItems.forEach(function(lineItem) {
if (lineItem.$isNewItem) {
lineItem.$isNewItem = false;
}
});
$stateParams.noReload = true;
$stateParams.isAddProduct = false;
$stateParams.program = vm.program;
$stateParams.facility = vm.facility;
draft.lineItems.forEach(function(lineItem) {
if (lineItem.$isNewItem) {
lineItem.$isNewItem = false;
}
});
$stateParams.noReload = true;

$state.go($state.current.name, $stateParams, {
reload: $state.current.name
$state.go($state.current.name, $stateParams, {
reload: $state.current.name
});
}, function(errorResponse) {
loadingModalService.close();
alertService.error(errorResponse.data.message);
});
});
}, function(errorResponse) {
loadingModalService.close();
alertService.error(errorResponse.data.message);
});
};

Expand Down
27 changes: 23 additions & 4 deletions src/stock-physical-inventory-draft/physical-inventory-draft.controller.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ describe('PhysicalInventoryDraftController', function() {
module('stock-physical-inventory-draft', function() {
chooseDateModalService = jasmine.createSpyObj('chooseDateModalService', ['show']);
});
module('admin-lot-edit');

inject(function($injector) {
this.$controller = $injector.get('$controller');
Expand Down Expand Up @@ -168,7 +169,8 @@ describe('PhysicalInventoryDraftController', function() {
stockmanagementUrlFactory: this.stockmanagementUrlFactory,
accessTokenFactory: this.accessTokenFactory,
confirmService: this.confirmService,
stockCardService: this.stockCardService
stockCardService: this.stockCardService,
LotResource: this.LotResource
});

this.vm.$onInit();
Expand Down Expand Up @@ -250,7 +252,7 @@ describe('PhysicalInventoryDraftController', function() {
this.lineItem4,
asd(this.lineItem1.orderable),
asd(this.lineItem3.orderable)
], [this.lineItem1, this.lineItem2, this.lineItem3, this.lineItem4]);
], this.draft);
});

function asd(orderable) {
Expand All @@ -267,9 +269,24 @@ describe('PhysicalInventoryDraftController', function() {

describe('saveDraft', function() {

it('should open confirmation modal', function() {
this.confirmService.confirmDestroy.andReturn(this.$q.resolve());
this.draftFactory.saveDraft.andReturn(this.$q.defer().promise);

this.vm.saveDraft();
this.$rootScope.$apply();

expect(this.confirmService.confirmDestroy).toHaveBeenCalledWith(
'stockPhysicalInventoryDraft.saveDraft',
'stockPhysicalInventoryDraft.save'
);
});

it('should save draft', function() {
this.confirmService.confirmDestroy.andReturn(this.$q.resolve());
this.draftFactory.saveDraft.andReturn(this.$q.defer().promise);
this.draftFactory.saveDraft.andReturn(this.$q.resolve());
spyOn(this.LotResource.prototype, 'create');

this.vm.saveDraft();
this.$rootScope.$apply();
Expand All @@ -278,7 +295,9 @@ describe('PhysicalInventoryDraftController', function() {
});

it('should cache draft', function() {
this.draftFactory.saveDraft.andReturn(this.$q.defer().promise);
this.confirmService.confirmDestroy.andReturn(this.$q.resolve());
this.draftFactory.saveDraft.andReturn(this.$q.resolve());

this.$rootScope.$apply();

this.vm.saveDraft();
Expand Down Expand Up @@ -359,7 +378,7 @@ describe('PhysicalInventoryDraftController', function() {

this.$rootScope.$apply();

expect(this.draftFactory.saveDraft).toHaveBeenCalled();
expect(this.physicalInventoryDraftCacheService.cacheDraft).toHaveBeenCalledWith(this.draft);
});
});

Expand Down
8 changes: 8 additions & 0 deletions src/stock-physical-inventory/physical-inventory.factory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,10 +217,14 @@
function prepareLineItems(physicalInventory, summaries, draftToReturn) {
var quantities = {},
extraData = {};
var newLineItems = [];

angular.forEach(physicalInventory.lineItems, function(lineItem) {
quantities[identityOf(lineItem)] = lineItem.quantity;
extraData[identityOf(lineItem)] = getExtraData(lineItem);
if (lineItem.$isNewItem) {
newLineItems.push(lineItem);
}
});

angular.forEach(summaries, function(summary) {
Expand All @@ -236,6 +240,10 @@
physicalInventory.$modified)
});
});

angular.forEach(newLineItems, function(newLineItem) {
draftToReturn.lineItems.push(newLineItem);
});
}

function identityOf(identifiable) {
Expand Down
22 changes: 22 additions & 0 deletions src/stock-physical-inventory/physical-inventory.factory.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,28 @@ describe('physicalInventoryFactory', function() {
});
});

it('should get proper response with new LineItem', function() {
var returnedDraft;
draft.lineItems.push({
$isNewItem: true,
isAdded: true,
lot: {
lotCode: 'TEST',
active: true
},
orderableId: 'orderable-1',
quantity: 100
});
physicalInventoryService.getPhysicalInventory.andReturn($q.when(draft));
physicalInventoryFactory.getPhysicalInventory(id).then(function(response) {
returnedDraft = response;
});
$rootScope.$apply();

expect(returnedDraft).toBeDefined();
expect(returnedDraft.lineItems.length).toEqual(3);
});

it('should get proper response when draft was modified', function() {
var returnedDraft;

Expand Down
Loading