OP-1189 | validate Inventory

bundle/language_en.properties

@@ -673,6 +673,9 @@ angal.inventory.cancelednoteditable.msg
 angal.inventory.chargetype.label                                                                       = Charge Type
 angal.inventory.clean.btn                                                                              = Clean Table
 angal.inventory.clean.btn.key                                                                          = T
+angal.inventory.choosedischargetypebeforevalidate.msg                                                  = Please choose discharge type and save inventory before validate.
+angal.inventory.choosechargetypebeforevalidate.msg                                                     = Please choose charge type and save inventory before validate.
+angal.inventory.choosesupplierbeforevalidate.msg                                                       = Please choose supplier and save inventory before validate.
 angal.inventory.destination.label                                                                      = Destination
 angal.inventory.dischargetype.label                                                                    = Discharge Type
 angal.inventory.draft                                                                                  = Draft
@@ -727,6 +730,12 @@ angal.inventory.done
 angal.inventory.validate.btn                                                                           = Validate
 angal.inventory.validate.btn.key                                                                       = V
 angal.inventory.validatednoteditable.msg                                                               = A validated inventory cannot be modified.
+angal.inventory.inventorymustsavebeforevalidate.msg                                                    = Inventory must be save before validate.
+angal.inventory.inventoryalreadyvalidate.msg                                                           = Inventory is already validate.
+angal.inventory.validate.success.msg                                                                   = The inventory has been successfully validated.
+angal.inventory.validate.error.msg                                                                     = Error during inventory validation.
+angal.inventory.validateajustinventoryerror.msg                                                        = Errors occur during stock's adjustment.
+angal.inventory.allinventoryrowshouldhavelotbeforevalidate.msg                                         = All the inventory rows should have lot before validate.
 angal.inventory.viewinventory.title                                                                    = View Inventory
 angal.inventory.youhavealreadyaddedallproduct.msg                                                      = You have already added all the products.
 angal.inventoryrow.realqty.col                                                                         = Real Qty

rsc/sms.properties.dist

@@ -28,6 +28,8 @@ skebby-gateway-service.ribbon.base-url=https://api.skebby.it:443
 # USER_KEY and ACCESS_TOKEN avoids the login call every time we need to send sms
 skebby-gateway-service.accessToken=
 skebby-gateway-service.userKey=
+# message_type: GP for Classic+, TI for Classic, SI for Basic (default)
+#skebby-gateway-service.messageType=
 
 
 ##################################################################

src/main/java/org/isf/medicalinventory/gui/InventoryEdit.java

@@ -160,6 +160,7 @@ private void fireInventoryUpdated() {
 	private JButton saveButton;
 	private JButton resetButton;
 	private JButton lotButton;
+	private JButton validateButton;
 	private JScrollPane scrollPaneInventory;
 	private JTable jTableInventoryRow;
 	private List<MedicalInventoryRow> inventoryRowList;
@@ -265,6 +266,7 @@ public void windowClosing(WindowEvent e) {
 		});
 		if (mode.equals("view")) {
 			saveButton.setVisible(false);
+			validateButton.setVisible(false);
 			deleteButton.setVisible(false);
 			columnEditable = columnEditableView;
 			codeTextField.setEditable(false);
@@ -280,6 +282,7 @@ public void windowClosing(WindowEvent e) {
 			lotButton.setVisible(false);
 		} else {
 			saveButton.setVisible(true);
+			validateButton.setVisible(true);
 			deleteButton.setVisible(true);
 			codeTextField.setEditable(true);
 			resetButton.setVisible(true);
@@ -428,6 +431,7 @@ private JPanel getPanelFooter() {
 		if (panelFooter == null) {
 			panelFooter = new JPanel();
 			panelFooter.add(getSaveButton());
+			panelFooter.add(getValidateButton());
 			panelFooter.add(getDeleteButton());
 			panelFooter.add(getLotButton());
 			panelFooter.add(getCleanTableButton());
@@ -538,8 +542,8 @@ private JButton getSaveButton() {
 						}
 						medicalInventoryRowManager.newMedicalInventoryRow(medicalInventoryRow);
 					}
-					// enable validation
 					mode = "update";
+					validateButton.setEnabled(true);
 					MessageDialog.info(this, "angal.inventory.savesuccess.msg");
 					fireInventoryInserted();
 					resetVariable();
@@ -889,6 +893,83 @@ private JButton getCleanTableButton() {
 		return resetButton;
 	}
 
+	private JButton getValidateButton() {
+		validateButton = new JButton(MessageBundle.getMessage("angal.inventory.validate.btn"));
+		validateButton.setMnemonic(MessageBundle.getMnemonic("angal.inventory.validate.btn.key"));
+		if (inventory == null) {
+			validateButton.setEnabled(false);
+		}
+		validateButton.addActionListener(actionEvent -> {
+				if (inventory == null) {
+					MessageDialog.info(null, "angal.inventory.inventorymustsavebeforevalidate.msg");
+					return;
+				}
+				if (inventory != null) {
+					if (inventory.getStatus().equals(InventoryStatus.validated.toString())) {
+						MessageDialog.info(null, "angal.inventory.inventoryalreadyvalidate.msg");
+						return;
+					}
+				}
+				List<MedicalInventoryRow> invRowWithoutLot = inventoryRowSearchList.stream().filter(invRow -> invRow.getLot() == null).collect(Collectors.toList());
+				if (invRowWithoutLot.size() > 0) {
+					MessageDialog.info(null, "angal.inventory.allinventoryrowshouldhavelotbeforevalidate.msg");
+					return;
+				}
+				String dischargeCode = inventory.getDischargeType();
+				String chargeCode = inventory.getChargeType();
+				Integer supplierId = inventory.getSupplier();
+				String wardCode = inventory.getDestination();
+				if (dischargeCode == null || dischargeCode.equals("")) {
+					MessageDialog.info(null, "angal.inventory.choosedischargetypebeforevalidate.msg");
+					return;
+				}
+				if (chargeCode == null || chargeCode.equals("")) {
+					MessageDialog.info(null, "angal.inventory.choosechargetypebeforevalidate.msg");
+					return;
+				}
+				if (supplierId == null || supplierId == 0) {
+					MessageDialog.info(null, "angal.inventory.choosesupplierbeforevalidate.msg");
+					return;
+				}
+				if (wardCode == null || wardCode.equals("")) {
+					MessageDialog.info(null, "angal.inventory.choosesupplierbeforevalidate.msg");
+					return;
+				}
+				// validate inventory
+				boolean validated = false;
+				try {
+					validated = medicalInventoryManager.validateInventory(inventory, inventoryRowSearchList);
+				} catch (OHServiceException e) {
+					OHServiceExceptionUtil.showMessages(e);
+					return;
+				}
+				// change state of inventory
+				if (validated) {
+					inventory.setStatus(InventoryStatus.validated.toString());
+					try {
+						inventory = medicalInventoryManager.updateMedicalInventory(inventory);
+					} catch (OHServiceException e) {
+						OHServiceExceptionUtil.showMessages(e);
+						return;
+					}
+					if (inventory != null) {
+						MessageDialog.info(null, "angal.inventory.validate.success.msg");
+						columnEditable = columnEditableView;
+						jTableInventoryRow.updateUI();
+						fireInventoryUpdated();
+						saveButton.setEnabled(false);
+					} else {
+						MessageDialog.info(null, "angal.inventory.validate.error.msg");
+						return;
+					}
+				} else {
+					MessageDialog.info(null, "angal.inventory.validateajustinventoryerror.msg");
+					return;
+				}
+			}
+		);
+		return validateButton;
+	}
 	private JScrollPane getScrollPaneInventory() {
 		if (scrollPaneInventory == null) {
 			scrollPaneInventory = new JScrollPane();
@@ -1110,6 +1191,7 @@ public void setValueAt(Object value, int r, int c) {
 					}
 					inventoryRowListAdded.add(invRow);
 					inventoryRowSearchList.set(r, invRow);
+					jTableInventoryRow.updateUI();
 				}
 			}
 

src/main/java/org/isf/sms/gui/SmsEdit.java

@@ -95,7 +95,7 @@ public SmsEdit(JFrame owner) {
 	}
 
 	private void initialize() {
-		maxLength = SmsManager.MAX_LENGHT;
+		maxLength = SmsManager.MAX_LENGTH;
 	}
 
 	private void initComponents() {