| {{vm.key('productCode') | message}} | -{{vm.key('product') | message}} | -{{vm.key('lotCode') | message}} | -{{vm.key('expiryDate') | message}} | -{{vm.key('soh') | message}} | -{{vm.key('srcDstLabel') | message}} | -{{vm.key('srcDstComments') | message}} | -{{vm.key('reason') | message}} | -{{vm.key('reasonComments') | message}} | -{{vm.key('quantity') | message}} | - -{{'adjustmentCreation.price' | message}} | -{{'adjustmentCreation.totalPrice' | message}} | - -{{vm.key('vvmStatus') | message}} | -{{vm.key('date') | message}} | -{{vm.key('actions') | message}} | -||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{vm.key('productCode') | message}} | +{{vm.key('product') | message}} | +{{vm.key('lotCode') | message}} | +{{vm.key('expiryDate') | message}} | +{{vm.key('soh') | message}} | +{{vm.key('srcDstLabel') | message}} | +{{vm.key('srcDstComments') | message}} | +{{vm.key('reason') | message}} | +{{vm.key('reasonComments') | message}} | +{{:: 'adjustmentCreation.unit' | message}} | +{{:: 'adjustmentCreation.itemQuantity' | message}} | +{{:: 'adjustmentCreation.totalQuantity' | message}} | + +{{:: 'adjustmentCreation.price' | message}} | +{{:: 'adjustmentCreation.totalPrice' | message}} | + +{{vm.key('vvmStatus') | message}} | +{{vm.key('date') | message}} | +{{vm.key('actions') | message}} | +
| {{lineItem.orderable.productCode}} | -{{lineItem.orderable | productName}} | -- | ++ + | ++ + | +
| {{'stockCardSummaryList.productCode' | message}} | -{{'stockCardSummaryList.product' | message}} | -{{'stockCardSummaryList.lotCode' | message}} | -{{'stockCardSummaryList.expiryDate' | message}} | -{{'stockCardSummaryList.lastUpdate' | message}} | -{{'stockCardSummaryList.stockOnHand' | message}} | +{{:: 'stockCardSummaryList.productCode' | message}} | +{{:: 'stockCardSummaryList.product' | message}} | +{{:: 'stockCardSummaryList.lotCode' | message}} | +{{:: 'stockCardSummaryList.expiryDate' | message}} | +{{:: 'stockCardSummaryList.lastUpdate' | message}} | +{{:: 'stockCardSummaryList.unit' | message }} | +{{:: 'stockCardSummaryList.stockOnHand' | message}} | -{{'stockCardSummaryList.unitPrice' | message}} | -{{'stockCardSummaryList.totalPrice' | message}} | +{{:: 'stockCardSummaryList.unitPrice' | message}} | +{{:: 'stockCardSummaryList.totalPrice' | message}} | -{{'stockCardSummaryList.actions' | message}} | +{{:: 'stockCardSummaryList.actions' | message}} | + | {{summary.stockOnHand}} | {{summary.orderable.unitPrice | openlmisCurrency}} | @@ -84,7 +104,9 @@{{fulfills.lot ? fulfills.lot.lotCode : ('stockCardSummaryList.noLotDefined' | message)}} | {{fulfills.lot ? (fulfills.lot.expirationDate | openlmisDate) : ''}} | {{fulfills.occurredDate | openlmisDate}} | -{{fulfills.stockOnHand}} | +{{ fulfills.orderable.unit.name }} | +{{fulfills.stockOnHand}} | +{{ vm.getSohForPacks(fulfills) }} | diff --git a/src/stock-card-summary-list/stock-card-summary-list.scss b/src/stock-card-summary-list/stock-card-summary-list.scss new file mode 100644 index 0000000..f5979e1 --- /dev/null +++ b/src/stock-card-summary-list/stock-card-summary-list.scss @@ -0,0 +1,10 @@ +.stock-card-buttons-group { + float: right !important; + display: flex !important; + gap: 3rem; + flex-direction: row; + + .units-package-switch { + @include flex-layout(row); + } +} diff --git a/src/stock-event/stock-event-line-item.js b/src/stock-event/stock-event-line-item.js new file mode 100644 index 0000000..88e9399 --- /dev/null +++ b/src/stock-event/stock-event-line-item.js @@ -0,0 +1,63 @@ +/* + * This program is part of the OpenLMIS logistics management information system platform software. + * Copyright © 2017 VillageReach + * + * This program is free software: you can redistribute it and/or modify it under the terms + * of the GNU Affero General Public License as published by the Free Software Foundation, either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. You should have received a copy of + * the GNU Affero General Public License along with this program. If not, see + * http://www.gnu.org/licenses. For additional information contact info@OpenLMIS.org. + */ + +(function() { + + 'use strict'; + + /** + * @ngdoc service + * @name stock-event.StockEventLineItem + * + * @description + * Represents a single Stock Event Line Item. + */ + angular + .module('stock-event') + .factory('StockEventLineItem', StockEventLineItem); + + function StockEventLineItem() { + + return StockEventLineItem; + + /** + * @ngdoc method + * @methodOf stock-event.StockEventLineItem + * @name StockEventLineItem + * + * @description + * Creates a new instance of the Stock Event Line Item class. + * + * @param {String} orderableId the orderable id + * @param {String} lotId the lot id + * @param {Number} quantity the quantity + * @param {String} occurredDate the occured date + * @param {Object} extraData the extra data + * @param {Array} stockAdjustments the stock adjustment list + * @param {string} unitOfOrderableId id of a unit + * @return {StockEventLineItem} the Stock Event Line Item object + */ + function StockEventLineItem(orderableId, lotId, quantity, occurredDate, extraData, stockAdjustments, + unitOfOrderableId) { + this.orderableId = orderableId; + this.lotId = lotId; + this.quantity = quantity; + this.occurredDate = occurredDate; + this.extraData = extraData; + this.stockAdjustments = stockAdjustments; + this.unitOfOrderableId = unitOfOrderableId; + } + } +})(); diff --git a/src/stock-event/stock-event.factory.js b/src/stock-event/stock-event.factory.js new file mode 100644 index 0000000..70faabb --- /dev/null +++ b/src/stock-event/stock-event.factory.js @@ -0,0 +1,89 @@ +/* + * This program is part of the OpenLMIS logistics management information system platform software. + * Copyright © 2017 VillageReach + * + * This program is free software: you can redistribute it and/or modify it under the terms + * of the GNU Affero General Public License as published by the Free Software Foundation, either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Affero General Public License for more details. You should have received a copy of + * the GNU Affero General Public License along with this program. If not, see + * http://www.gnu.org/licenses. For additional information contact info@OpenLMIS.org. + */ + +(function() { + + 'use strict'; + + /** + * @ngdoc service + * @name stock-event.stockEventFactory + * + * @description + * Allows the user to create new stock event based on passed data. + */ + angular + .module('stock-event') + .factory('stockEventFactory', factory); + + factory.$inject = [ '$filter', 'StockEventAdjustment', 'StockEventLineItem', 'StockEvent' ]; + + function factory($filter, StockEventAdjustment, StockEventLineItem, StockEvent) { + + return { + createFromPhysicalInventory: createFromPhysicalInventory + }; + + /** + * @ngdoc method + * @methodOf stock-event.stockEventFactory + * @name createFromPhysicalInventory + * + * @description + * Creates a stock event based on data from physical Inventory + * + * @param {Object} physicalInventory the physical Inventory + * @return {StockEvent} the new instance of stock event + */ + function createFromPhysicalInventory(physicalInventory) { + var physicalInventoryCopy = angular.copy(physicalInventory); + physicalInventoryCopy.lineItems = physicalInventory.lineItems + .filter(function(item) { + return item.isAdded; + }) + .map(function(item) { + var stockAdjustments = []; + + if (item.stockAdjustments) { + stockAdjustments = _.map(item.stockAdjustments, function(adjustment) { + return new StockEventAdjustment(adjustment.reason.id, adjustment.quantity); + }); + } + + if (!item.quantity && item.active === false) { + item.quantity = 0; + } + + if ((!item.quantity && item.quantity !== 0) && item.active === true) { + throw 'stockPhysicalInventoryDraft.submitInvalidActive'; + } + + if (item.unitOfOrderableId) { + console.log('this one has unit: ' + item); + } + + return new StockEventLineItem( + item.orderable.id, item.lot ? item.lot.id : null, + item.quantity, physicalInventory.occurredDate, + { + vvmStatus: item.vvmStatus + }, stockAdjustments, item.unitOfOrderableId + ); + }); + + return new StockEvent(physicalInventoryCopy); + } + } +})(); diff --git a/src/stock-physical-inventory-draft/_physical-inventory-draft.scss b/src/stock-physical-inventory-draft/_physical-inventory-draft.scss new file mode 100644 index 0000000..19e1264 --- /dev/null +++ b/src/stock-physical-inventory-draft/_physical-inventory-draft.scss @@ -0,0 +1,6 @@ +.buttons-section { + display: flex; + flex-direction: row; + gap: .5rem; + align-items: center; +} diff --git a/src/stock-physical-inventory-draft/messages_en.json b/src/stock-physical-inventory-draft/messages_en.json new file mode 100644 index 0000000..685673d --- /dev/null +++ b/src/stock-physical-inventory-draft/messages_en.json @@ -0,0 +1,5 @@ +{ + "stockPhysicalInventoryDraft.addUnit": "Create unit", + "stockPhysicalInventoryDraft.quantity": "Quantity", + "stockPhysicalInventoryDraft.unit": "Unit" +} \ No newline at end of file diff --git a/src/stock-physical-inventory-draft/physical-inventory-draft-cache.service.js b/src/stock-physical-inventory-draft/physical-inventory-draft-cache.service.js index 87488ac..bbc69b7 100644 --- a/src/stock-physical-inventory-draft/physical-inventory-draft-cache.service.js +++ b/src/stock-physical-inventory-draft/physical-inventory-draft-cache.service.js @@ -91,7 +91,7 @@ return lineItem.lot && (lineItem.lot.lotCode && !lineItem.lot.id) && (existingItemsWithNewLots.filter(function(lineItemWithNewLot) { return lineItemWithNewLot.displayLotMessage === lineItem.displayLotMessage && - lineItemWithNewLot.orderable.id === lineItem.orderable.id; + lineItemWithNewLot.orderable.id === lineItem.orderable.id && lineItemWithNewLot.stockCardId; }).length === 0); }); diff --git a/src/stock-physical-inventory-draft/physical-inventory-draft.controller.js b/src/stock-physical-inventory-draft/physical-inventory-draft.controller.js index fb836a5..c8694e6 100644 --- a/src/stock-physical-inventory-draft/physical-inventory-draft.controller.js +++ b/src/stock-physical-inventory-draft/physical-inventory-draft.controller.js @@ -35,7 +35,7 @@ 'VVM_STATUS', 'reasons', 'stockReasonsCalculations', 'loadingModalService', '$window', 'stockmanagementUrlFactory', 'accessTokenFactory', 'orderableGroupService', '$filter', '$q', 'offlineService', 'physicalInventoryDraftCacheService', 'stockCardService', 'LotResource', - 'editLotModalService']; + 'editLotModalService', 'unitOfOrderableService']; function controller($scope, $state, $stateParams, addProductsModalService, messageService, physicalInventoryFactory, notificationService, alertService, @@ -44,7 +44,7 @@ reasons, stockReasonsCalculations, loadingModalService, $window, stockmanagementUrlFactory, accessTokenFactory, orderableGroupService, $filter, $q, offlineService, physicalInventoryDraftCacheService, stockCardService, - LotResource, editLotModalService) { + LotResource, editLotModalService, unitOfOrderableService) { var vm = this; vm.$onInit = onInit; @@ -246,6 +246,17 @@ */ vm.dataChanged = false; + /** + * @ngdoc property + * @propertyOf stock-physical-inventory-draft.controller:PhysicalInventoryDraftController + * @name unitsOfOrderable + * @type {boolean} + * + * @description + * Holds possible units for orderable + */ + vm.unitsOfOrderable = undefined; + /** * @ngdoc method * @methodOf stock-physical-inventory-draft.controller:PhysicalInventoryDraftController @@ -427,6 +438,20 @@ }); }; + function multiplyUnitsByFactor(lineItems) { + lineItems.forEach(function(lineItem) { + if (lineItem.unitOfOrderableId) { + var assignedUnit = vm.unitsOfOrderable.find(function(unit) { + return unit.id === lineItem.unitOfOrderableId; + }); + + if (assignedUnit && lineItem.quantity) { + lineItem.quantity *= assignedUnit.factor; + } + } + }); + } + /** * @ngdoc method * @methodOf stock-physical-inventory-draft.controller:PhysicalInventoryDraftController @@ -436,6 +461,7 @@ * Save physical inventory draft. */ vm.saveDraft = function(withNotification) { + multiplyUnitsByFactor(draft.lineItems); loadingModalService.open(); return physicalInventoryFactory.saveDraft(draft).then(function() { if (!withNotification) { @@ -726,6 +752,11 @@ $stateParams.program = undefined; $stateParams.facility = undefined; + unitOfOrderableService.getAll() + .then(function(response) { + vm.unitsOfOrderable = response.content; + }); + // ANGOLASUP-806: Implement adding default reason in physical inventory if (vm.stateParams.defaultReason !== null) { vm.useDefaultReason = true; diff --git a/src/stock-physical-inventory-draft/physical-inventory-draft.html b/src/stock-physical-inventory-draft/physical-inventory-draft.html index 2288e83..b86d42c 100644 --- a/src/stock-physical-inventory-draft/physical-inventory-draft.html +++ b/src/stock-physical-inventory-draft/physical-inventory-draft.html @@ -1,28 +1,21 @@ |
|---|